diff --git a/applications/Decoder/Decoder.build b/Decoder/Decoder.build similarity index 100% rename from applications/Decoder/Decoder.build rename to Decoder/Decoder.build diff --git a/applications/Decoder/Decoder.cs b/Decoder/Decoder.cs similarity index 100% rename from applications/Decoder/Decoder.cs rename to Decoder/Decoder.cs diff --git a/applications/Decoder/Decoder.csproj b/Decoder/Decoder.csproj similarity index 94% rename from applications/Decoder/Decoder.csproj rename to Decoder/Decoder.csproj index 2c52c4ba..89d3964f 100644 --- a/applications/Decoder/Decoder.csproj +++ b/Decoder/Decoder.csproj @@ -15,7 +15,7 @@ true full false - ..\..\bin\ + ..\bin\ DEBUG;TRACE prompt 4 @@ -34,7 +34,7 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} libsecondlife diff --git a/applications/Decoder/README b/Decoder/README similarity index 100% rename from applications/Decoder/README rename to Decoder/README diff --git a/applications/SLProxy/Analyst.cs b/SLProxy/Analyst.cs similarity index 100% rename from applications/SLProxy/Analyst.cs rename to SLProxy/Analyst.cs diff --git a/applications/SLProxy/ChatConsole.cs b/SLProxy/ChatConsole.cs similarity index 100% rename from applications/SLProxy/ChatConsole.cs rename to SLProxy/ChatConsole.cs diff --git a/applications/SLProxy/ChatConsole.csproj b/SLProxy/ChatConsole.csproj similarity index 95% rename from applications/SLProxy/ChatConsole.csproj rename to SLProxy/ChatConsole.csproj index 15f17a41..9764aeb3 100644 --- a/applications/SLProxy/ChatConsole.csproj +++ b/SLProxy/ChatConsole.csproj @@ -83,7 +83,7 @@ System.XML - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} libsecondlife diff --git a/applications/SLProxy/README.txt b/SLProxy/README.txt similarity index 100% rename from applications/SLProxy/README.txt rename to SLProxy/README.txt diff --git a/applications/SLProxy/SLProxy.build b/SLProxy/SLProxy.build similarity index 100% rename from applications/SLProxy/SLProxy.build rename to SLProxy/SLProxy.build diff --git a/applications/SLProxy/SLProxy.cs b/SLProxy/SLProxy.cs similarity index 100% rename from applications/SLProxy/SLProxy.cs rename to SLProxy/SLProxy.cs diff --git a/applications/SLProxy/SLProxy.csproj b/SLProxy/SLProxy.csproj similarity index 94% rename from applications/SLProxy/SLProxy.csproj rename to SLProxy/SLProxy.csproj index 49394735..e27f1e79 100644 --- a/applications/SLProxy/SLProxy.csproj +++ b/SLProxy/SLProxy.csproj @@ -27,7 +27,7 @@ - ..\..\bin\ + ..\bin\ false 285212672 false @@ -93,7 +93,7 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} libsecondlife diff --git a/applications/SLProxy/SLProxyLoader.cs b/SLProxy/SLProxyLoader.cs similarity index 91% rename from applications/SLProxy/SLProxyLoader.cs rename to SLProxy/SLProxyLoader.cs index 11668d17..8fbf3845 100644 --- a/applications/SLProxy/SLProxyLoader.cs +++ b/SLProxy/SLProxyLoader.cs @@ -48,6 +48,7 @@ namespace SLProxy public ProxyFrame(string[] args) { + bool externalPlugin = false; this.args = args; ProxyConfig proxyConfig = new ProxyConfig("SLProxy", "Austin Jennings / Andrew Ortman", args); @@ -72,15 +73,21 @@ namespace SLProxy string sw = arg.Substring(0, ipos); string val = arg.Substring(ipos + 1); Console.WriteLine("arg '" + sw + "' val '" + val + "'"); - if (sw == "--load") LoadPlugin(val); + if (sw == "--load") + { + externalPlugin = true; + LoadPlugin(val); + } } } commandDelegates["/load"] = new CommandDelegate(CmdLoad); - // TODO: It would be nice to detect if no plugins are loaded and load Analyst by default - //ProxyPlugin analyst = new Analyst(this); - //analyst.Init(); + if (!externalPlugin) + { + ProxyPlugin analyst = new Analyst(this); + analyst.Init(); + } } private void CmdLoad(string[] words) diff --git a/applications/SLProxy/SLProxyMain.cs b/SLProxy/SLProxyMain.cs similarity index 100% rename from applications/SLProxy/SLProxyMain.cs rename to SLProxy/SLProxyMain.cs diff --git a/applications/SecondGlance/Properties/AssemblyInfo.cs b/SecondGlance/Properties/AssemblyInfo.cs similarity index 100% rename from applications/SecondGlance/Properties/AssemblyInfo.cs rename to SecondGlance/Properties/AssemblyInfo.cs diff --git a/applications/SecondGlance/Properties/Resources.Designer.cs b/SecondGlance/Properties/Resources.Designer.cs similarity index 100% rename from applications/SecondGlance/Properties/Resources.Designer.cs rename to SecondGlance/Properties/Resources.Designer.cs diff --git a/applications/SecondGlance/Properties/Resources.resx b/SecondGlance/Properties/Resources.resx similarity index 100% rename from applications/SecondGlance/Properties/Resources.resx rename to SecondGlance/Properties/Resources.resx diff --git a/applications/SecondGlance/Properties/Settings.Designer.cs b/SecondGlance/Properties/Settings.Designer.cs similarity index 100% rename from applications/SecondGlance/Properties/Settings.Designer.cs rename to SecondGlance/Properties/Settings.Designer.cs diff --git a/applications/SecondGlance/Properties/Settings.settings b/SecondGlance/Properties/Settings.settings similarity index 100% rename from applications/SecondGlance/Properties/Settings.settings rename to SecondGlance/Properties/Settings.settings diff --git a/applications/SecondGlance/SecondGlance.cs b/SecondGlance/SecondGlance.cs similarity index 100% rename from applications/SecondGlance/SecondGlance.cs rename to SecondGlance/SecondGlance.cs diff --git a/applications/SecondGlance/SecondGlance.csproj b/SecondGlance/SecondGlance.csproj similarity index 95% rename from applications/SecondGlance/SecondGlance.csproj rename to SecondGlance/SecondGlance.csproj index 3488cb8d..2f1a00da 100644 --- a/applications/SecondGlance/SecondGlance.csproj +++ b/SecondGlance/SecondGlance.csproj @@ -67,7 +67,7 @@ - + {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} libsecondlife diff --git a/applications/SecondGlance/frmSecondGlance.Designer.cs b/SecondGlance/frmSecondGlance.Designer.cs similarity index 100% rename from applications/SecondGlance/frmSecondGlance.Designer.cs rename to SecondGlance/frmSecondGlance.Designer.cs diff --git a/applications/SecondGlance/frmSecondGlance.cs b/SecondGlance/frmSecondGlance.cs similarity index 100% rename from applications/SecondGlance/frmSecondGlance.cs rename to SecondGlance/frmSecondGlance.cs diff --git a/applications/SecondGlance/frmSecondGlance.resx b/SecondGlance/frmSecondGlance.resx similarity index 100% rename from applications/SecondGlance/frmSecondGlance.resx rename to SecondGlance/frmSecondGlance.resx diff --git a/applications/SLProxy/Analyst.csproj b/applications/SLProxy/Analyst.csproj deleted file mode 100644 index 118705d4..00000000 --- a/applications/SLProxy/Analyst.csproj +++ /dev/null @@ -1,108 +0,0 @@ - - - Local - 8.0.50727 - 2.0 - {6222B134-AE5F-489A-8A77-423A721B7C62} - Debug - AnyCPU - - - - - Analyst - - - JScript - Grid - IE50 - false - Library - Analyst - OnBuildSuccess - - - - - - - - - ..\..\bin\ - false - 285212672 - false - - - DEBUG;TRACE - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - - - ..\..\bin\ - false - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - - - - System - - - System.Data - - - System.XML - - - {D9CDEDFB-8169-4B03-B57F-0DF638F044EC} - libsecondlife - - - SLProxy - {E4115DC9-FC88-47D6-B3B6-2400AD19B80D} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - - - Code - - - - - - - - - - \ No newline at end of file diff --git a/applications/SLProxy/Proxy.csproj b/applications/SLProxy/Proxy.csproj deleted file mode 100644 index 0a65614a..00000000 --- a/applications/SLProxy/Proxy.csproj +++ /dev/null @@ -1,51 +0,0 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {0516E1A7-D062-4830-859C-6FD0E4F84E75} - Exe - Proxy - Proxy - - - true - full - false - ..\..\bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 - - - - - - - - - - - - {E4115DC9-FC88-47D6-B3B6-2400AD19B80D} - SLProxy - - - - - \ No newline at end of file diff --git a/builds/libsl_office.prims b/builds/libsl_office.prims deleted file mode 100644 index 73b2d350..00000000 --- a/builds/libsl_office.prims +++ /dev/null @@ -1,9560 +0,0 @@ - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -FALSE -FALSE -FALSE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libjaspernet/JasperWrapper.cs b/libjaspernet/JasperWrapper.cs deleted file mode 100644 index bf39ebe4..00000000 --- a/libjaspernet/JasperWrapper.cs +++ /dev/null @@ -1,406 +0,0 @@ -using System; -using System.IO; -using System.Runtime.InteropServices; // For DllImport() - -public struct jas_matrix_t -{ - /* A matrix of pixels (one matrix per component) */ - public int flags; /* Additional state information. */ - public int xstart; /* The starting horizontal index. */ - public int ystart; /* The starting vertical index. */ - public int xend; /* The ending horizontal index. */ - public int yend; /* The ending vertical index. */ - public int numrows; /* The number of rows in the matrix. */ - public int numcols; /* The number of columns in the matrix. */ - public IntPtr row_ptrs; /* Pointers to the start of each row. */ - public int maxrows; /* The allocated size of the rows array. */ - public IntPtr data; /* The matrix data buffer. */ - public int datasize; /* The allocated size of the data array. */ - - public static jas_matrix_t fromPtr(IntPtr ptr) - { - return (jas_matrix_t)Marshal.PtrToStructure(ptr, typeof(jas_matrix_t)); - } - - public int[] get_int_array() - { - int[] retval = new int[datasize]; - Marshal.Copy(data, retval, 0, datasize); /* only the low byte has any meaning */ - return retval; - } - - public int get_pixel(int x, int y) - { - return Marshal.ReadInt32(data, y * numcols + x); - } -} - -public struct jas_image_cmpt_t -{ /* Image component class. */ - public int tlx; /* The x-coordinate of the top-left corner of the component. */ - public int tly; /* The y-coordinate of the top-left corner of the component. */ - public int hstep; /* The horizontal sampling period in units of the reference grid. */ - public int vstep; /* The vertical sampling period in units of the reference grid. */ - public int width; /* The component width in samples. */ - public int height; /* The component height in samples. */ - public int prec; /* precision */ - public int sgnd; /* signed-ness */ - public IntPtr stream; /* The stream containing the component data. */ - public int cps; /* The number of characters per sample in the stream. */ - public int type; /* The type of component (e.g., opacity, red, green, blue, luma). */ - - public static jas_image_cmpt_t fromPtr(IntPtr ptr) - { - return (jas_image_cmpt_t)Marshal.PtrToStructure(ptr, typeof(jas_image_cmpt_t)); - } -} - -public struct jas_image_t -{ - public int tlx; /* The x-coordinate of the top-left corner of the image bounding box. */ - public int tly; /* The y-coordinate of the top-left corner of the image bounding box. */ - public int brx; /* The x-coordinate of the bottom-right corner of the image bounding - box (plus one). */ - public int bry; /* The y-coordinate of the bottom-right corner of the image bounding - box (plus one). */ - public int numcmpts; /* The number of components. */ - public int maxcmpts; /* The maximum number of components that this image can have (i.e., the - allocated size of the components array). */ - public IntPtr cmpts; /* array of pointers to jas_image_cmpt_t: Per-component information. */ - public int clrspc; - public IntPtr cmprof; - public bool inmem; - - public static jas_image_t fromPtr(IntPtr ptr) - { - return (jas_image_t)Marshal.PtrToStructure(ptr, typeof(jas_image_t)); - } - - public int width { get { return brx - tlx; } } - public int height { get { return bry - tly; } } - - public jas_image_cmpt_t[] get_components() - { - jas_image_cmpt_t[] retval = new jas_image_cmpt_t[numcmpts]; - int i; - - for (i = 0; i < numcmpts; i++) retval[i] = jas_image_cmpt_t.fromPtr(Marshal.ReadIntPtr(cmpts, i * 4)); - return retval; - } - -} - -public class JasperWrapper -{ - const string JASPER_LIBRARY = "libjasper.dll"; - - protected static bool Initialized = false; - protected static int Initialized_Value; - - [DllImport(JASPER_LIBRARY)] - protected static extern int jas_init(); - - public static void jasper_init() - { - if (!Initialized) - { - Initialized = true; - jas_init(); // always returns zero. - } - } - - [DllImport(JASPER_LIBRARY)] - private static extern IntPtr jas_getversion(); - - [DllImport(JASPER_LIBRARY)] - private static extern int jas_setdbglevel(int level); - - [DllImport(JASPER_LIBRARY, CharSet=CharSet.Ansi)] - public static extern IntPtr jas_stream_fopen(string filename, string mode); - - [DllImport(JASPER_LIBRARY)] - private static extern IntPtr jas_stream_memopen(IntPtr buf, int bufsize); - - [DllImport(JASPER_LIBRARY)] - private static extern IntPtr jas_stream_tmpfile(); - - [DllImport(JASPER_LIBRARY)] - private static extern int jas_stream_rewind(IntPtr stream); - - [DllImport(JASPER_LIBRARY)] - private static extern int jas_stream_copy(IntPtr out_stream, IntPtr in_stream, int all); - - public static IntPtr jas_stream_memopen(byte[] buf) - { - IntPtr bufPtr = Marshal.AllocHGlobal(buf.Length); - Marshal.Copy(buf, 0, bufPtr, buf.Length); - - return jas_stream_memopen(bufPtr, buf.Length); - } - - [DllImport(JASPER_LIBRARY)] - public static extern int jas_stream_flush(IntPtr stream); - - [DllImport(JASPER_LIBRARY)] - public static extern int jas_stream_close(IntPtr stream); - - [DllImport(JASPER_LIBRARY)] - public static extern int jas_image_getfmt(IntPtr stream); - - /* Get the ID for the image format with the specified name. */ - [DllImport(JASPER_LIBRARY, CharSet=CharSet.Ansi)] - private static extern int jas_image_strtofmt(string name); - - [DllImport(JASPER_LIBRARY, CharSet=CharSet.Ansi)] - public static extern int jas_image_fmtfromname(string filename); - - [DllImport(JASPER_LIBRARY, CharSet=CharSet.Ansi)] - public static extern int jas_image_encode(IntPtr image, IntPtr out_stream, int fmt, string optstr); - - [DllImport(JASPER_LIBRARY, CharSet=CharSet.Ansi)] - public static extern IntPtr jas_image_decode(IntPtr in_stream, int fmt, string optstr); - - [DllImport(JASPER_LIBRARY)] - public static extern IntPtr jas_image_destroy(IntPtr image_ptr); - - public static int jas_image_cmpttype(jas_image_t image, int cmptno) - { - jas_image_cmpt_t cmpt = - (jas_image_cmpt_t)Marshal.PtrToStructure(Marshal.ReadIntPtr(image.cmpts, cmptno * 4), - typeof(jas_image_cmpt_t)); - return cmpt.type; - } - - [DllImport(JASPER_LIBRARY)] - public static extern int jas_image_readcmpt(IntPtr image_ptr, int cmptno, - int x, int y, int width, int height, IntPtr data); - - public static string get_jasper_version() - { - string text = Marshal.PtrToStringAnsi(jas_getversion()); - if (text == null) throw new Exception("jas_getversion returned NULL\n"); - return text; - } - - [DllImport(JASPER_LIBRARY)] - public static extern IntPtr jas_matrix_create(int width, int height); - - [DllImport(JASPER_LIBRARY)] - public static extern void jas_matrix_destroy(IntPtr matrix); - - public static int[] get_multiplexed_image_data(IntPtr image_ptr, int[] order) - { - if (order.Length > 4) throw new Exception("order.Length must be <= 4"); - jas_image_t image_struct = jas_image_t.fromPtr(image_ptr); - - IntPtr matrix = jas_matrix_create(image_struct.height, image_struct.width); - int[] pixels = new int[image_struct.height * image_struct.width]; - - for (int c = 0; c < order.Length; c++) - { - if (order[c] == -1) for (int i = 0; i < pixels.Length; i++) pixels[i] |= 0xFF << (c * 8); - else - { - int retval = jas_image_readcmpt(image_ptr, order[c], 0, 0, - image_struct.width, image_struct.height, matrix); - if (retval != 0) - { - jas_matrix_destroy(matrix); - throw new Exception("jas_image_readcmpt returned " + retval); - } - - int[] temp_array = (jas_matrix_t.fromPtr(matrix)).get_int_array(); - for (int i = 0; i < temp_array.Length; i++) pixels[i] |= (temp_array[i] & 0xFF) << (c * 8); - } - } - jas_matrix_destroy(matrix); - return pixels; - } - - public static String version - { - get { return get_jasper_version(); } - } - - /* This function can convert any file format that GeoJASPER can read - (tif, jpg, bmp, pnm, ras) into j2c. The input format is determined - by the extension of the input file. */ - - public static byte[] jasper_encode_j2c(string filename) { - jasper_init(); - IntPtr input_stream_ptr = jas_stream_fopen(filename, "rb"); - int format = jas_image_getfmt(input_stream_ptr); - - Console.WriteLine("file is format # " + format); - - IntPtr image_ptr = jas_image_decode(input_stream_ptr, format, ""); - if (image_ptr == IntPtr.Zero) throw new Exception("Error decoding image"); - jas_image_t image_struct = jas_image_t.fromPtr(image_ptr); - - int output_buffer_size = image_struct.width * image_struct.height * - image_struct.numcmpts * 4 + 4096; // it's called a safety margin - - IntPtr bufPtr = Marshal.AllocHGlobal(output_buffer_size); - IntPtr output_stream_ptr = jas_stream_memopen(bufPtr, output_buffer_size); - - Console.WriteLine("Ready to encode"); - Console.WriteLine("jas_image_strtofmt(j2c)=" + jas_image_strtofmt("j2c")); - Console.WriteLine("jas_image_strtofmt(tif)=" + jas_image_strtofmt("tif")); - int retval = jas_image_encode(image_ptr, output_stream_ptr, - jas_image_strtofmt("j2c"), ""); - - jas_stream_flush(output_stream_ptr); - if (retval != 0) throw new Exception("Error encoding image: " + retval); - - byte[] buf = new byte[output_buffer_size]; - Marshal.Copy(bufPtr, buf, 0, output_buffer_size); - Marshal.FreeHGlobal(bufPtr); - - jas_image_destroy(image_ptr); - - jas_stream_close(input_stream_ptr); - - return buf; - } - - public static byte[] jasper_decode_j2c_to_tiff(byte[] input) - { - jasper_init(); - - int header_size = 1024; // a guess - IntPtr input_stream_ptr = jas_stream_memopen(input); - IntPtr temp_stream_ptr = jas_stream_tmpfile(); - - int format = jas_image_getfmt(input_stream_ptr); - - Console.WriteLine("file is format # " + format); - - IntPtr image_ptr = jas_image_decode(input_stream_ptr, format, ""); - if (image_ptr == IntPtr.Zero) throw new Exception("Error decoding image"); - jas_image_t image_struct = jas_image_t.fromPtr(image_ptr); - - int output_buffer_size = image_struct.width * image_struct.height * - image_struct.numcmpts * 4 + 4096; // it's called a safety margin - - IntPtr bufPtr = Marshal.AllocHGlobal(output_buffer_size); - IntPtr output_stream_ptr = jas_stream_memopen(bufPtr, output_buffer_size); - - Console.WriteLine("Ready to encode"); - Console.WriteLine("jas_image_strtofmt(j2c)=" + jas_image_strtofmt("j2c")); - Console.WriteLine("jas_image_strtofmt(tif)=" + jas_image_strtofmt("tif")); - int retval = jas_image_encode(image_ptr, temp_stream_ptr, - jas_image_strtofmt("tif"), ""); - - jas_stream_flush(temp_stream_ptr); - jas_stream_rewind(temp_stream_ptr); - jas_stream_copy(output_stream_ptr, temp_stream_ptr, -1); - jas_stream_flush(output_stream_ptr); - if (retval != 0) throw new Exception("Error encoding image: " + retval); - - byte[] buf = new byte[output_buffer_size]; - Marshal.Copy(bufPtr, buf, 0, output_buffer_size); - Marshal.FreeHGlobal(bufPtr); - - jas_image_destroy(image_ptr); - - // jas_stream_close(output_stream_ptr); - jas_stream_close(temp_stream_ptr); - jas_stream_close(input_stream_ptr); - - return buf; - } - - public static byte[] jasper_decode_j2c_to_tga(byte[] input) - { - jasper_init(); - - int header_size = 32; // roughly - IntPtr input_stream_ptr = jas_stream_memopen(input); - - int format = jas_image_getfmt(input_stream_ptr); - - Console.WriteLine("file is format # " + format); - - IntPtr image_ptr = jas_image_decode(input_stream_ptr, format, ""); - if (image_ptr == IntPtr.Zero) throw new Exception("Error decoding image"); - - jas_image_t image_struct = jas_image_t.fromPtr(image_ptr); - - Console.WriteLine("image has " + image_struct.numcmpts + " components"); - int[] mux_order = null; - switch (image_struct.numcmpts) - { - case 4: mux_order = new int[] { 2, 1, 0, 3 }; break; /* BGRA */ - case 3: mux_order = new int[] { 2, 1, 0, -1 }; break; /* BGR1 */ - case 2: mux_order = new int[] { 0, 0, 0, 1 }; break; /* GGGA */ - case 1: mux_order = new int[] { 0, 0, 0, -1 }; break; /* GGG1 */ - default: throw new Exception("Unhandled number of components:" + image_struct.numcmpts); - } - - int[] pixels = get_multiplexed_image_data(image_ptr, mux_order); - byte[] output = new byte[image_struct.height * image_struct.width * 4 + header_size]; - int offset = 0; - output[offset++] = 0; // idlength - output[offset++] = 0; // colormaptype = 0: no colormap - output[offset++] = 2; // image type = 2: uncompressed RGB - output[offset++] = 0; // color map spec is five zeroes for no color map - output[offset++] = 0; // color map spec is five zeroes for no color map - output[offset++] = 0; // color map spec is five zeroes for no color map - output[offset++] = 0; // color map spec is five zeroes for no color map - output[offset++] = 0; // color map spec is five zeroes for no color map - output[offset++] = 0; // x origin = two bytes - output[offset++] = 0; // x origin = two bytes - output[offset++] = 0; // y origin = two bytes - output[offset++] = 0; // y origin = two bytes - output[offset++] = (byte)(image_struct.width & 0xFF); // width - low byte - output[offset++] = (byte)(image_struct.width >> 8); // width - hi byte - output[offset++] = (byte)(image_struct.height & 0xFF); // height - low byte - output[offset++] = (byte)(image_struct.height >> 8); // height - hi byte - output[offset++] = 32; // 32 bits per pixel - output[offset++] = 40;//8; // image descriptor byte -- 8 bits of Alpha data per pixel - for (int i = 0; i < (image_struct.width * image_struct.height); i++) - { - output[offset++] = (byte)(pixels[i] & 0xFF); // red - output[offset++] = (byte)((pixels[i] >> 8) & 0xFF); // green - output[offset++] = (byte)((pixels[i] >> 16) & 0xFF); // blue - output[offset++] = (byte)((pixels[i] >> 24) & 0xFF); // alpha - } - - jas_image_destroy(image_ptr); - jas_stream_close(input_stream_ptr); - - return output; - } - - public static void Main(string[] args) - { - jas_init(); - Console.WriteLine("get_jasper_version=" + get_jasper_version()); - jas_setdbglevel(1000); - - if (args.Length == 1) - { - Console.WriteLine("Opening file: " + args[0]); - FileStream read_stream = new FileStream(args[0], FileMode.Open, FileAccess.Read); - BinaryReader binary_reader = new BinaryReader(read_stream); - byte[] j2c_data = binary_reader.ReadBytes((int)read_stream.Length); - binary_reader.Close(); - read_stream.Close(); - - /* byte[] tga_data = jasper_decode_j2c_to_tga(j2c_data); - Console.WriteLine("Writing output to output.tga"); - FileStream write_stream = new FileStream("output.tga", FileMode.Create); - write_stream.Write(tga_data, 0, tga_data.Length); - write_stream.Close(); */ - - - byte[] tiff_data = jasper_decode_j2c_to_tiff(j2c_data); - Console.WriteLine("Writing output to output.tif"); - FileStream write_stream = new FileStream("output.tif", FileMode.Create); - write_stream.Write(tiff_data, 0, tiff_data.Length); - write_stream.Close(); - - return; - } - } -} diff --git a/libjaspernet/Properties/AssemblyInfo.cs b/libjaspernet/Properties/AssemblyInfo.cs deleted file mode 100644 index 96e5524d..00000000 --- a/libjaspernet/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("libjaspernet")] -[assembly: AssemblyDescription("A wrapper for libjasper")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("libsecondlife")] -[assembly: AssemblyProduct("libjaspernet")] -[assembly: AssemblyCopyright("Copyright © libsecondlife 2006")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("50d5e6b6-1a19-4095-9b8a-a46bd56f4223")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/libjaspernet/libjasper.dll b/libjaspernet/libjasper.dll deleted file mode 100644 index b2a69bbf..00000000 Binary files a/libjaspernet/libjasper.dll and /dev/null differ diff --git a/libjaspernet/libjasper.dylib b/libjaspernet/libjasper.dylib deleted file mode 100644 index 388310ef..00000000 Binary files a/libjaspernet/libjasper.dylib and /dev/null differ diff --git a/libjaspernet/libjasper.so b/libjaspernet/libjasper.so deleted file mode 100644 index 92f4bf5e..00000000 Binary files a/libjaspernet/libjasper.so and /dev/null differ diff --git a/libjaspernet/libjaspernet.build b/libjaspernet/libjaspernet.build deleted file mode 100644 index 1d5b9b41..00000000 --- a/libjaspernet/libjaspernet.build +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libjaspernet/libjaspernet.csproj b/libjaspernet/libjaspernet.csproj deleted file mode 100644 index 5f600dcf..00000000 --- a/libjaspernet/libjaspernet.csproj +++ /dev/null @@ -1,49 +0,0 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {7D4C4807-7705-48A7-9D82-F6689FBBCC8B} - Library - Properties - libjaspernet - libjaspernet - - - - - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - \ No newline at end of file diff --git a/libjaspernet/libjaspernet.dll.config b/libjaspernet/libjaspernet.dll.config deleted file mode 100644 index d708a52e..00000000 --- a/libjaspernet/libjaspernet.dll.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/libjaspernet/libjaspernet.sln b/libjaspernet/libjaspernet.sln deleted file mode 100644 index caf46990..00000000 --- a/libjaspernet/libjaspernet.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libjaspernet", "libjaspernet.csproj", "{7D4C4807-7705-48A7-9D82-F6689FBBCC8B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7D4C4807-7705-48A7-9D82-F6689FBBCC8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D4C4807-7705-48A7-9D82-F6689FBBCC8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D4C4807-7705-48A7-9D82-F6689FBBCC8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D4C4807-7705-48A7-9D82-F6689FBBCC8B}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libprims/AUTHORS b/libprims/AUTHORS deleted file mode 100644 index c5b38068..00000000 --- a/libprims/AUTHORS +++ /dev/null @@ -1,2 +0,0 @@ -C.J. Adams-Collier - I do stuff. diff --git a/libprims/ChangeLog b/libprims/ChangeLog deleted file mode 100644 index b5857c31..00000000 --- a/libprims/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2006-09-21 C.J. Collier - Initial check-in. This project will be used to read, manipulate - and write .prims files. diff --git a/libprims/Makefile b/libprims/Makefile deleted file mode 100644 index fcddbc3e..00000000 --- a/libprims/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -SOURCES = prims01.cs PrimsLoader.cs - -RESOURCES = prims01.xsd - -CSC = mcs -XSD = xsd - -all: libprims.dll - -libprims.dll: $(SOURCES) $(RESOURCES) - $(CSC) -resource:prims01.xsd \ - $(SOURCES) \ - -target:library \ - -out:libprims.dll - -prims01.cs: prims01.xsd - $(XSD) prims01.xsd /c - -clean: - rm *.dll prims01.cs diff --git a/libprims/PrimsLoader.cs b/libprims/PrimsLoader.cs deleted file mode 100644 index 61a6a209..00000000 --- a/libprims/PrimsLoader.cs +++ /dev/null @@ -1,75 +0,0 @@ - -using System; -using System.Xml; -using System.Xml.Serialization; -using System.Xml.Schema; -using System.Reflection; - -namespace PrimsTest -{ - public class PrimsLoader - { - - public PrimsLoader() - { - } - - public Schemas.primitives Load(System.IO.Stream stream) - { - - System.Xml.XmlTextReader r = - new XmlTextReader( stream ); - - System.Xml.XmlValidatingReader vr = - new XmlValidatingReader(r); - - System.IO.Stream schemaStream = - System.Reflection.Assembly.GetExecutingAssembly(). - GetManifestResourceStream("prims01.xsd"); - - System.Xml.XmlTextReader schemaReader = - new System.Xml.XmlTextReader( schemaStream ); - - System.Xml.Schema.XmlSchema schema = - System.Xml.Schema.XmlSchema.Read(schemaReader, MyValidationEventHandler); - - // Rewind the stream - //schemaStream.Seek(0,System.IO.SeekOrigin.Begin); - - schemaStream = System.Reflection.Assembly.GetExecutingAssembly(). - GetManifestResourceStream("prims01.xsd"); - - vr.Schemas.Add(schema.TargetNamespace, - new System.Xml.XmlTextReader( schemaStream ) - ); - - vr.ValidationType = ValidationType.Schema; - - vr.ValidationEventHandler += - new ValidationEventHandler(MyValidationEventHandler); - - System.Xml.Serialization.XmlSerializer s = - new System.Xml.Serialization.XmlSerializer(typeof(Schemas.primitives)); - - Schemas.primitives ps = (Schemas.primitives) s.Deserialize(vr); - - return ps; - } - - public Schemas.primitives Load(System.String fname) - { - - System.IO.FileStream stream = - new System.IO.FileStream(fname, System.IO.FileMode.Open); - - return this.Load(stream); - - } - - public static void MyValidationEventHandler(object sender, - ValidationEventArgs args) - { - Console.WriteLine("Validation event: " + args.Message); - } - } -} diff --git a/libprims/libprims.mdp b/libprims/libprims.mdp deleted file mode 100644 index 3118d246..00000000 --- a/libprims/libprims.mdp +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libprims/prims01.xsd b/libprims/prims01.xsd deleted file mode 100644 index ab033079..00000000 --- a/libprims/prims01.xsd +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - First public revision of .prims schema - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libsecondlife-cs/AssemblyInfo.cs b/libsecondlife/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/AssemblyInfo.cs rename to libsecondlife/AssemblyInfo.cs diff --git a/libsecondlife-cs/AssetSystem/AppearanceManager.cs b/libsecondlife/AssetSystem/AppearanceManager.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AppearanceManager.cs rename to libsecondlife/AssetSystem/AppearanceManager.cs diff --git a/libsecondlife-cs/AssetSystem/Asset.cs b/libsecondlife/AssetSystem/Asset.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/Asset.cs rename to libsecondlife/AssetSystem/Asset.cs diff --git a/libsecondlife-cs/AssetSystem/AssetImage.cs b/libsecondlife/AssetSystem/AssetImage.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AssetImage.cs rename to libsecondlife/AssetSystem/AssetImage.cs diff --git a/libsecondlife-cs/AssetSystem/AssetManager.cs b/libsecondlife/AssetSystem/AssetManager.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AssetManager.cs rename to libsecondlife/AssetSystem/AssetManager.cs diff --git a/libsecondlife-cs/AssetSystem/AssetNotecard.cs b/libsecondlife/AssetSystem/AssetNotecard.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AssetNotecard.cs rename to libsecondlife/AssetSystem/AssetNotecard.cs diff --git a/libsecondlife-cs/AssetSystem/AssetPacketHelpers.cs b/libsecondlife/AssetSystem/AssetPacketHelpers.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AssetPacketHelpers.cs rename to libsecondlife/AssetSystem/AssetPacketHelpers.cs diff --git a/libsecondlife-cs/AssetSystem/AssetRequest.cs b/libsecondlife/AssetSystem/AssetRequest.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AssetRequest.cs rename to libsecondlife/AssetSystem/AssetRequest.cs diff --git a/libsecondlife-cs/AssetSystem/AssetRequestUpload.cs b/libsecondlife/AssetSystem/AssetRequestUpload.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AssetRequestUpload.cs rename to libsecondlife/AssetSystem/AssetRequestUpload.cs diff --git a/libsecondlife-cs/AssetSystem/AssetScript.cs b/libsecondlife/AssetSystem/AssetScript.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AssetScript.cs rename to libsecondlife/AssetSystem/AssetScript.cs diff --git a/libsecondlife-cs/AssetSystem/AssetWearable.cs b/libsecondlife/AssetSystem/AssetWearable.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AssetWearable.cs rename to libsecondlife/AssetSystem/AssetWearable.cs diff --git a/libsecondlife-cs/AssetSystem/AssetWearable_Body.cs b/libsecondlife/AssetSystem/AssetWearable_Body.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AssetWearable_Body.cs rename to libsecondlife/AssetSystem/AssetWearable_Body.cs diff --git a/libsecondlife-cs/AssetSystem/AssetWearable_Clothing.cs b/libsecondlife/AssetSystem/AssetWearable_Clothing.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/AssetWearable_Clothing.cs rename to libsecondlife/AssetSystem/AssetWearable_Clothing.cs diff --git a/libsecondlife-cs/AssetSystem/BodyPart_Deprecated.cs b/libsecondlife/AssetSystem/BodyPart_Deprecated.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/BodyPart_Deprecated.cs rename to libsecondlife/AssetSystem/BodyPart_Deprecated.cs diff --git a/libsecondlife-cs/AssetSystem/ImageManager.cs b/libsecondlife/AssetSystem/ImageManager.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/ImageManager.cs rename to libsecondlife/AssetSystem/ImageManager.cs diff --git a/libsecondlife-cs/AssetSystem/ImagePacketHelpers.cs b/libsecondlife/AssetSystem/ImagePacketHelpers.cs similarity index 100% rename from libsecondlife-cs/AssetSystem/ImagePacketHelpers.cs rename to libsecondlife/AssetSystem/ImagePacketHelpers.cs diff --git a/libsecondlife-cs/Avatar.cs b/libsecondlife/Avatar.cs similarity index 100% rename from libsecondlife-cs/Avatar.cs rename to libsecondlife/Avatar.cs diff --git a/libsecondlife-cs/AvatarManager.cs b/libsecondlife/AvatarManager.cs similarity index 100% rename from libsecondlife-cs/AvatarManager.cs rename to libsecondlife/AvatarManager.cs diff --git a/libsecondlife-cs/BakeLayer.cs b/libsecondlife/BakeLayer.cs similarity index 100% rename from libsecondlife-cs/BakeLayer.cs rename to libsecondlife/BakeLayer.cs diff --git a/libsecondlife-cs/BitPack.cs b/libsecondlife/BitPack.cs similarity index 100% rename from libsecondlife-cs/BitPack.cs rename to libsecondlife/BitPack.cs diff --git a/libsecondlife-cs/Caps.cs b/libsecondlife/Caps.cs similarity index 100% rename from libsecondlife-cs/Caps.cs rename to libsecondlife/Caps.cs diff --git a/libsecondlife-cs/DirectoryManager.cs b/libsecondlife/DirectoryManager.cs similarity index 100% rename from libsecondlife-cs/DirectoryManager.cs rename to libsecondlife/DirectoryManager.cs diff --git a/libsecondlife-cs/EstateTools.cs b/libsecondlife/EstateTools.cs similarity index 100% rename from libsecondlife-cs/EstateTools.cs rename to libsecondlife/EstateTools.cs diff --git a/libsecondlife-cs/GridManager.cs b/libsecondlife/GridManager.cs similarity index 99% rename from libsecondlife-cs/GridManager.cs rename to libsecondlife/GridManager.cs index 8da894c6..9758a37b 100644 --- a/libsecondlife-cs/GridManager.cs +++ b/libsecondlife/GridManager.cs @@ -45,8 +45,7 @@ namespace libsecondlife public string Name; /// public Simulator.SimAccess Access; - /// Marked obsolete since it appears to always be zero (None) - [Obsolete] + /// Appears to always be zero (None) public Simulator.RegionFlags RegionFlags; /// Sim's defined Water Height public byte WaterHeight; diff --git a/libsecondlife-cs/GroupManager.cs b/libsecondlife/GroupManager.cs similarity index 100% rename from libsecondlife-cs/GroupManager.cs rename to libsecondlife/GroupManager.cs diff --git a/libsecondlife-cs/Helpers.cs b/libsecondlife/Helpers.cs similarity index 98% rename from libsecondlife-cs/Helpers.cs rename to libsecondlife/Helpers.cs index 1e5e03ec..e69e85c7 100644 --- a/libsecondlife-cs/Helpers.cs +++ b/libsecondlife/Helpers.cs @@ -401,7 +401,7 @@ namespace libsecondlife /// hex dump will be written instead /// The StringBuilder object to write to /// The byte array to convert to a string - public static void FieldToString(StringBuilder output, byte[] bytes) + internal static void FieldToString(StringBuilder output, byte[] bytes) { FieldToString(output, bytes, String.Empty); } @@ -582,9 +582,9 @@ namespace libsecondlife } /// - /// Convert a unix timestamp to a native DateTime format + /// Convert a UNIX timestamp to a native DateTime object /// - /// An unsigned integer representing a unix + /// An unsigned integer representing a UNIX /// timestamp /// A DateTime object containing the same time specified in /// the given timestamp @@ -599,6 +599,18 @@ namespace libsecondlife return dateTime; } + /// + /// Convert a native DateTime object to a UNIX timestamp + /// + /// A DateTime object you want to convert to a + /// timestamp + /// An unsigned integer representing a UNIX timestamp + public static uint DateTimeToUnixTime(DateTime time) + { + TimeSpan ts = (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0)); + return (uint)ts.TotalSeconds; + } + /// /// Converts a vector style rotation to a quaternion /// diff --git a/libsecondlife-cs/InventorySystem/DownloadRequest_Folder.cs b/libsecondlife/InventorySystem/DownloadRequest_Folder.cs similarity index 100% rename from libsecondlife-cs/InventorySystem/DownloadRequest_Folder.cs rename to libsecondlife/InventorySystem/DownloadRequest_Folder.cs diff --git a/libsecondlife-cs/InventorySystem/InventoryBase.cs b/libsecondlife/InventorySystem/InventoryBase.cs similarity index 100% rename from libsecondlife-cs/InventorySystem/InventoryBase.cs rename to libsecondlife/InventorySystem/InventoryBase.cs diff --git a/libsecondlife-cs/InventorySystem/InventoryFolder.cs b/libsecondlife/InventorySystem/InventoryFolder.cs similarity index 100% rename from libsecondlife-cs/InventorySystem/InventoryFolder.cs rename to libsecondlife/InventorySystem/InventoryFolder.cs diff --git a/libsecondlife-cs/InventorySystem/InventoryImage.cs b/libsecondlife/InventorySystem/InventoryImage.cs similarity index 100% rename from libsecondlife-cs/InventorySystem/InventoryImage.cs rename to libsecondlife/InventorySystem/InventoryImage.cs diff --git a/libsecondlife-cs/InventorySystem/InventoryItem.cs b/libsecondlife/InventorySystem/InventoryItem.cs similarity index 100% rename from libsecondlife-cs/InventorySystem/InventoryItem.cs rename to libsecondlife/InventorySystem/InventoryItem.cs diff --git a/libsecondlife-cs/InventorySystem/InventoryManager.cs b/libsecondlife/InventorySystem/InventoryManager.cs similarity index 100% rename from libsecondlife-cs/InventorySystem/InventoryManager.cs rename to libsecondlife/InventorySystem/InventoryManager.cs diff --git a/libsecondlife-cs/InventorySystem/InventoryNotecard.cs b/libsecondlife/InventorySystem/InventoryNotecard.cs similarity index 100% rename from libsecondlife-cs/InventorySystem/InventoryNotecard.cs rename to libsecondlife/InventorySystem/InventoryNotecard.cs diff --git a/libsecondlife-cs/InventorySystem/InventoryPacketHelper.cs b/libsecondlife/InventorySystem/InventoryPacketHelper.cs similarity index 100% rename from libsecondlife-cs/InventorySystem/InventoryPacketHelper.cs rename to libsecondlife/InventorySystem/InventoryPacketHelper.cs diff --git a/libsecondlife-cs/InventorySystem/InventoryScript.cs b/libsecondlife/InventorySystem/InventoryScript.cs similarity index 100% rename from libsecondlife-cs/InventorySystem/InventoryScript.cs rename to libsecondlife/InventorySystem/InventoryScript.cs diff --git a/libsecondlife-cs/InventorySystem/InventoryWearable.cs b/libsecondlife/InventorySystem/InventoryWearable.cs similarity index 100% rename from libsecondlife-cs/InventorySystem/InventoryWearable.cs rename to libsecondlife/InventorySystem/InventoryWearable.cs diff --git a/libsecondlife-cs/JSON/JSONArray.cs b/libsecondlife/JSON/JSONArray.cs similarity index 100% rename from libsecondlife-cs/JSON/JSONArray.cs rename to libsecondlife/JSON/JSONArray.cs diff --git a/libsecondlife-cs/JSON/JSONFacade.cs b/libsecondlife/JSON/JSONFacade.cs similarity index 100% rename from libsecondlife-cs/JSON/JSONFacade.cs rename to libsecondlife/JSON/JSONFacade.cs diff --git a/libsecondlife-cs/JSON/JSONObject.cs b/libsecondlife/JSON/JSONObject.cs similarity index 100% rename from libsecondlife-cs/JSON/JSONObject.cs rename to libsecondlife/JSON/JSONObject.cs diff --git a/libsecondlife-cs/JSON/JSONTokener.cs b/libsecondlife/JSON/JSONTokener.cs similarity index 100% rename from libsecondlife-cs/JSON/JSONTokener.cs rename to libsecondlife/JSON/JSONTokener.cs diff --git a/libsecondlife-cs/LLObject.cs b/libsecondlife/LLObject.cs similarity index 100% rename from libsecondlife-cs/LLObject.cs rename to libsecondlife/LLObject.cs diff --git a/libsecondlife-cs/LLSD.cs b/libsecondlife/LLSD.cs similarity index 100% rename from libsecondlife-cs/LLSD.cs rename to libsecondlife/LLSD.cs diff --git a/libsecondlife-cs/MainAvatar.cs b/libsecondlife/MainAvatar.cs similarity index 100% rename from libsecondlife-cs/MainAvatar.cs rename to libsecondlife/MainAvatar.cs diff --git a/libsecondlife-cs/MainAvatarStatus.cs b/libsecondlife/MainAvatarStatus.cs similarity index 100% rename from libsecondlife-cs/MainAvatarStatus.cs rename to libsecondlife/MainAvatarStatus.cs diff --git a/libsecondlife-cs/NameValue.cs b/libsecondlife/NameValue.cs similarity index 100% rename from libsecondlife-cs/NameValue.cs rename to libsecondlife/NameValue.cs diff --git a/libsecondlife-cs/NetworkManager.cs b/libsecondlife/NetworkManager.cs similarity index 100% rename from libsecondlife-cs/NetworkManager.cs rename to libsecondlife/NetworkManager.cs diff --git a/libsecondlife-cs/ObjectManager.cs b/libsecondlife/ObjectManager.cs similarity index 100% rename from libsecondlife-cs/ObjectManager.cs rename to libsecondlife/ObjectManager.cs diff --git a/libsecondlife-cs/ParcelManager.cs b/libsecondlife/ParcelManager.cs similarity index 99% rename from libsecondlife-cs/ParcelManager.cs rename to libsecondlife/ParcelManager.cs index 9ef6c016..9fe47530 100644 --- a/libsecondlife-cs/ParcelManager.cs +++ b/libsecondlife/ParcelManager.cs @@ -184,8 +184,7 @@ namespace libsecondlife public bool ReservedNewbie; /// Date land was claimed public DateTime ClaimDate; - /// Marked obsolete since it appears to always be zero - [Obsolete] + /// Appears to always be zero public int ClaimPrice; /// public int RentPrice; @@ -195,7 +194,8 @@ namespace libsecondlife /// Maximum corner of the axis-aligned bounding box for this /// parcel public LLVector3 AABBMax; - /// Bitmap describing land layout in 4x4m squares across the entire region + /// Bitmap describing land layout in 4x4m squares across the + /// entire region public byte[] Bitmap; /// Total parcel land area public int Area; @@ -209,11 +209,11 @@ namespace libsecondlife public int MaxPrims; /// Total number of primitives on this parcel public int TotalPrims; - /// Total number of primitives owned by the parcel owner on this - /// parcel + /// Total number of primitives owned by the parcel owner on + /// this parcel public int OwnerPrims; - /// Total number of primitives owned by the parcel group on this - /// parcel + /// Total number of primitives owned by the parcel group on + /// this parcel public int GroupPrims; /// Total number of other primitives on this parcel public int OtherPrims; diff --git a/libsecondlife-cs/ParticleSystem.cs b/libsecondlife/ParticleSystem.cs similarity index 100% rename from libsecondlife-cs/ParticleSystem.cs rename to libsecondlife/ParticleSystem.cs diff --git a/libsecondlife-cs/Prims.cs b/libsecondlife/Prims.cs similarity index 100% rename from libsecondlife-cs/Prims.cs rename to libsecondlife/Prims.cs diff --git a/libsecondlife-cs/ProtocolManager.cs b/libsecondlife/ProtocolManager.cs similarity index 100% rename from libsecondlife-cs/ProtocolManager.cs rename to libsecondlife/ProtocolManager.cs diff --git a/libsecondlife-cs/README.txt b/libsecondlife/README.txt similarity index 100% rename from libsecondlife-cs/README.txt rename to libsecondlife/README.txt diff --git a/libsecondlife-cs/Resources/glove_length_alpha.tga b/libsecondlife/Resources/glove_length_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/glove_length_alpha.tga rename to libsecondlife/Resources/glove_length_alpha.tga diff --git a/libsecondlife-cs/Resources/gloves_fingers_alpha.tga b/libsecondlife/Resources/gloves_fingers_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/gloves_fingers_alpha.tga rename to libsecondlife/Resources/gloves_fingers_alpha.tga diff --git a/libsecondlife-cs/Resources/jacket_length_lower_alpha.tga b/libsecondlife/Resources/jacket_length_lower_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/jacket_length_lower_alpha.tga rename to libsecondlife/Resources/jacket_length_lower_alpha.tga diff --git a/libsecondlife-cs/Resources/jacket_length_upper_alpha.tga b/libsecondlife/Resources/jacket_length_upper_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/jacket_length_upper_alpha.tga rename to libsecondlife/Resources/jacket_length_upper_alpha.tga diff --git a/libsecondlife-cs/Resources/jacket_open_lower_alpha.tga b/libsecondlife/Resources/jacket_open_lower_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/jacket_open_lower_alpha.tga rename to libsecondlife/Resources/jacket_open_lower_alpha.tga diff --git a/libsecondlife-cs/Resources/jacket_open_upper_alpha.tga b/libsecondlife/Resources/jacket_open_upper_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/jacket_open_upper_alpha.tga rename to libsecondlife/Resources/jacket_open_upper_alpha.tga diff --git a/libsecondlife-cs/Resources/pants_length_alpha.tga b/libsecondlife/Resources/pants_length_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/pants_length_alpha.tga rename to libsecondlife/Resources/pants_length_alpha.tga diff --git a/libsecondlife-cs/Resources/pants_waist_alpha.tga b/libsecondlife/Resources/pants_waist_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/pants_waist_alpha.tga rename to libsecondlife/Resources/pants_waist_alpha.tga diff --git a/libsecondlife-cs/Resources/shirt_bottom_alpha.tga b/libsecondlife/Resources/shirt_bottom_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/shirt_bottom_alpha.tga rename to libsecondlife/Resources/shirt_bottom_alpha.tga diff --git a/libsecondlife-cs/Resources/shirt_collar_alpha.tga b/libsecondlife/Resources/shirt_collar_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/shirt_collar_alpha.tga rename to libsecondlife/Resources/shirt_collar_alpha.tga diff --git a/libsecondlife-cs/Resources/shirt_collar_back_alpha.tga b/libsecondlife/Resources/shirt_collar_back_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/shirt_collar_back_alpha.tga rename to libsecondlife/Resources/shirt_collar_back_alpha.tga diff --git a/libsecondlife-cs/Resources/shirt_sleeve_alpha.tga b/libsecondlife/Resources/shirt_sleeve_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/shirt_sleeve_alpha.tga rename to libsecondlife/Resources/shirt_sleeve_alpha.tga diff --git a/libsecondlife-cs/Resources/shoe_height_alpha.tga b/libsecondlife/Resources/shoe_height_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/shoe_height_alpha.tga rename to libsecondlife/Resources/shoe_height_alpha.tga diff --git a/libsecondlife-cs/Resources/skirt_length_alpha.tga b/libsecondlife/Resources/skirt_length_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/skirt_length_alpha.tga rename to libsecondlife/Resources/skirt_length_alpha.tga diff --git a/libsecondlife-cs/Resources/skirt_slit_back_alpha.tga b/libsecondlife/Resources/skirt_slit_back_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/skirt_slit_back_alpha.tga rename to libsecondlife/Resources/skirt_slit_back_alpha.tga diff --git a/libsecondlife-cs/Resources/skirt_slit_front_alpha.tga b/libsecondlife/Resources/skirt_slit_front_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/skirt_slit_front_alpha.tga rename to libsecondlife/Resources/skirt_slit_front_alpha.tga diff --git a/libsecondlife-cs/Resources/skirt_slit_left_alpha.tga b/libsecondlife/Resources/skirt_slit_left_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/skirt_slit_left_alpha.tga rename to libsecondlife/Resources/skirt_slit_left_alpha.tga diff --git a/libsecondlife-cs/Resources/skirt_slit_right_alpha.tga b/libsecondlife/Resources/skirt_slit_right_alpha.tga similarity index 100% rename from libsecondlife-cs/Resources/skirt_slit_right_alpha.tga rename to libsecondlife/Resources/skirt_slit_right_alpha.tga diff --git a/libsecondlife-cs/SecondLife.cs b/libsecondlife/SecondLife.cs similarity index 100% rename from libsecondlife-cs/SecondLife.cs rename to libsecondlife/SecondLife.cs diff --git a/libsecondlife-cs/SerializableDictionary.cs b/libsecondlife/SerializableDictionary.cs similarity index 100% rename from libsecondlife-cs/SerializableDictionary.cs rename to libsecondlife/SerializableDictionary.cs diff --git a/libsecondlife-cs/Settings.cs b/libsecondlife/Settings.cs similarity index 100% rename from libsecondlife-cs/Settings.cs rename to libsecondlife/Settings.cs diff --git a/libsecondlife-cs/Simulator.cs b/libsecondlife/Simulator.cs similarity index 100% rename from libsecondlife-cs/Simulator.cs rename to libsecondlife/Simulator.cs diff --git a/libsecondlife-cs/TerrainManager.cs b/libsecondlife/TerrainManager.cs similarity index 100% rename from libsecondlife-cs/TerrainManager.cs rename to libsecondlife/TerrainManager.cs diff --git a/libsecondlife-cs/Textures.cs b/libsecondlife/Textures.cs similarity index 100% rename from libsecondlife-cs/Textures.cs rename to libsecondlife/Textures.cs diff --git a/libsecondlife-cs/Types.cs b/libsecondlife/Types.cs similarity index 100% rename from libsecondlife-cs/Types.cs rename to libsecondlife/Types.cs diff --git a/libsecondlife-cs/VisualParamGenerator/VisualParamGenerator.cs b/libsecondlife/VisualParamGenerator/VisualParamGenerator.cs similarity index 100% rename from libsecondlife-cs/VisualParamGenerator/VisualParamGenerator.cs rename to libsecondlife/VisualParamGenerator/VisualParamGenerator.cs diff --git a/libsecondlife-cs/VisualParamGenerator/VisualParamGenerator.csproj b/libsecondlife/VisualParamGenerator/VisualParamGenerator.csproj similarity index 100% rename from libsecondlife-cs/VisualParamGenerator/VisualParamGenerator.csproj rename to libsecondlife/VisualParamGenerator/VisualParamGenerator.csproj diff --git a/libsecondlife-cs/VisualParamGenerator/template.cs b/libsecondlife/VisualParamGenerator/template.cs similarity index 100% rename from libsecondlife-cs/VisualParamGenerator/template.cs rename to libsecondlife/VisualParamGenerator/template.cs diff --git a/libsecondlife-cs/XmlRpcCS/Logger.cs b/libsecondlife/XmlRpcCS/Logger.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/Logger.cs rename to libsecondlife/XmlRpcCS/Logger.cs diff --git a/libsecondlife-cs/XmlRpcCS/SimpleHttpRequest.cs b/libsecondlife/XmlRpcCS/SimpleHttpRequest.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/SimpleHttpRequest.cs rename to libsecondlife/XmlRpcCS/SimpleHttpRequest.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcBoxcarRequest.cs b/libsecondlife/XmlRpcCS/XmlRpcBoxcarRequest.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcBoxcarRequest.cs rename to libsecondlife/XmlRpcCS/XmlRpcBoxcarRequest.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcClientProxy.cs b/libsecondlife/XmlRpcCS/XmlRpcClientProxy.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcClientProxy.cs rename to libsecondlife/XmlRpcCS/XmlRpcClientProxy.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcDeserializer.cs b/libsecondlife/XmlRpcCS/XmlRpcDeserializer.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcDeserializer.cs rename to libsecondlife/XmlRpcCS/XmlRpcDeserializer.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcErrorCodes.cs b/libsecondlife/XmlRpcCS/XmlRpcErrorCodes.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcErrorCodes.cs rename to libsecondlife/XmlRpcCS/XmlRpcErrorCodes.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcException.cs b/libsecondlife/XmlRpcCS/XmlRpcException.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcException.cs rename to libsecondlife/XmlRpcCS/XmlRpcException.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcExposedAttribute.cs b/libsecondlife/XmlRpcCS/XmlRpcExposedAttribute.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcExposedAttribute.cs rename to libsecondlife/XmlRpcCS/XmlRpcExposedAttribute.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcRequest.cs b/libsecondlife/XmlRpcCS/XmlRpcRequest.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcRequest.cs rename to libsecondlife/XmlRpcCS/XmlRpcRequest.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcRequestDeserializer.cs b/libsecondlife/XmlRpcCS/XmlRpcRequestDeserializer.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcRequestDeserializer.cs rename to libsecondlife/XmlRpcCS/XmlRpcRequestDeserializer.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcRequestSerializer.cs b/libsecondlife/XmlRpcCS/XmlRpcRequestSerializer.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcRequestSerializer.cs rename to libsecondlife/XmlRpcCS/XmlRpcRequestSerializer.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcResponder.cs b/libsecondlife/XmlRpcCS/XmlRpcResponder.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcResponder.cs rename to libsecondlife/XmlRpcCS/XmlRpcResponder.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcResponse.cs b/libsecondlife/XmlRpcCS/XmlRpcResponse.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcResponse.cs rename to libsecondlife/XmlRpcCS/XmlRpcResponse.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcResponseDeserializer.cs b/libsecondlife/XmlRpcCS/XmlRpcResponseDeserializer.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcResponseDeserializer.cs rename to libsecondlife/XmlRpcCS/XmlRpcResponseDeserializer.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcResponseSerializer.cs b/libsecondlife/XmlRpcCS/XmlRpcResponseSerializer.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcResponseSerializer.cs rename to libsecondlife/XmlRpcCS/XmlRpcResponseSerializer.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcSerializer.cs b/libsecondlife/XmlRpcCS/XmlRpcSerializer.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcSerializer.cs rename to libsecondlife/XmlRpcCS/XmlRpcSerializer.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcServer.cs b/libsecondlife/XmlRpcCS/XmlRpcServer.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcServer.cs rename to libsecondlife/XmlRpcCS/XmlRpcServer.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcSystemObject.cs b/libsecondlife/XmlRpcCS/XmlRpcSystemObject.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcSystemObject.cs rename to libsecondlife/XmlRpcCS/XmlRpcSystemObject.cs diff --git a/libsecondlife-cs/XmlRpcCS/XmlRpcXmlTokens.cs b/libsecondlife/XmlRpcCS/XmlRpcXmlTokens.cs similarity index 100% rename from libsecondlife-cs/XmlRpcCS/XmlRpcXmlTokens.cs rename to libsecondlife/XmlRpcCS/XmlRpcXmlTokens.cs diff --git a/libsecondlife-cs/_Packets_.cs b/libsecondlife/_Packets_.cs similarity index 100% rename from libsecondlife-cs/_Packets_.cs rename to libsecondlife/_Packets_.cs diff --git a/libsecondlife-cs/_VisualParam_.cs b/libsecondlife/_VisualParam_.cs similarity index 100% rename from libsecondlife-cs/_VisualParam_.cs rename to libsecondlife/_VisualParam_.cs diff --git a/libsecondlife-cs/examples/Baker/Baker.cs b/libsecondlife/examples/Baker/Baker.cs similarity index 100% rename from libsecondlife-cs/examples/Baker/Baker.cs rename to libsecondlife/examples/Baker/Baker.cs diff --git a/libsecondlife-cs/examples/Baker/Baker.csproj b/libsecondlife/examples/Baker/Baker.csproj similarity index 100% rename from libsecondlife-cs/examples/Baker/Baker.csproj rename to libsecondlife/examples/Baker/Baker.csproj diff --git a/libsecondlife-cs/examples/Baker/frmBaker.Designer.cs b/libsecondlife/examples/Baker/frmBaker.Designer.cs similarity index 100% rename from libsecondlife-cs/examples/Baker/frmBaker.Designer.cs rename to libsecondlife/examples/Baker/frmBaker.Designer.cs diff --git a/libsecondlife-cs/examples/Baker/frmBaker.cs b/libsecondlife/examples/Baker/frmBaker.cs similarity index 100% rename from libsecondlife-cs/examples/Baker/frmBaker.cs rename to libsecondlife/examples/Baker/frmBaker.cs diff --git a/libsecondlife-cs/examples/Baker/frmBaker.resx b/libsecondlife/examples/Baker/frmBaker.resx similarity index 100% rename from libsecondlife-cs/examples/Baker/frmBaker.resx rename to libsecondlife/examples/Baker/frmBaker.resx diff --git a/libsecondlife-cs/examples/BodyPartMorphGenerator/BodyPartMorphGenerator.csproj b/libsecondlife/examples/BodyPartMorphGenerator/BodyPartMorphGenerator.csproj similarity index 100% rename from libsecondlife-cs/examples/BodyPartMorphGenerator/BodyPartMorphGenerator.csproj rename to libsecondlife/examples/BodyPartMorphGenerator/BodyPartMorphGenerator.csproj diff --git a/libsecondlife-cs/examples/BodyPartMorphGenerator/Properties/AssemblyInfo.cs b/libsecondlife/examples/BodyPartMorphGenerator/Properties/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/examples/BodyPartMorphGenerator/Properties/AssemblyInfo.cs rename to libsecondlife/examples/BodyPartMorphGenerator/Properties/AssemblyInfo.cs diff --git a/libsecondlife-cs/examples/BodyPartMorphGenerator/genbodyparams.cs b/libsecondlife/examples/BodyPartMorphGenerator/genbodyparams.cs similarity index 100% rename from libsecondlife-cs/examples/BodyPartMorphGenerator/genbodyparams.cs rename to libsecondlife/examples/BodyPartMorphGenerator/genbodyparams.cs diff --git a/libsecondlife-cs/examples/Heightmap/Heightmap.cs b/libsecondlife/examples/Heightmap/Heightmap.cs similarity index 100% rename from libsecondlife-cs/examples/Heightmap/Heightmap.cs rename to libsecondlife/examples/Heightmap/Heightmap.cs diff --git a/libsecondlife-cs/examples/Heightmap/Heightmap.csproj b/libsecondlife/examples/Heightmap/Heightmap.csproj similarity index 100% rename from libsecondlife-cs/examples/Heightmap/Heightmap.csproj rename to libsecondlife/examples/Heightmap/Heightmap.csproj diff --git a/libsecondlife-cs/examples/Heightmap/Properties/AssemblyInfo.cs b/libsecondlife/examples/Heightmap/Properties/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/examples/Heightmap/Properties/AssemblyInfo.cs rename to libsecondlife/examples/Heightmap/Properties/AssemblyInfo.cs diff --git a/libsecondlife-cs/examples/Heightmap/Properties/Resources.Designer.cs b/libsecondlife/examples/Heightmap/Properties/Resources.Designer.cs similarity index 100% rename from libsecondlife-cs/examples/Heightmap/Properties/Resources.Designer.cs rename to libsecondlife/examples/Heightmap/Properties/Resources.Designer.cs diff --git a/libsecondlife-cs/examples/Heightmap/Properties/Resources.resx b/libsecondlife/examples/Heightmap/Properties/Resources.resx similarity index 100% rename from libsecondlife-cs/examples/Heightmap/Properties/Resources.resx rename to libsecondlife/examples/Heightmap/Properties/Resources.resx diff --git a/libsecondlife-cs/examples/Heightmap/Properties/Settings.Designer.cs b/libsecondlife/examples/Heightmap/Properties/Settings.Designer.cs similarity index 100% rename from libsecondlife-cs/examples/Heightmap/Properties/Settings.Designer.cs rename to libsecondlife/examples/Heightmap/Properties/Settings.Designer.cs diff --git a/libsecondlife-cs/examples/Heightmap/Properties/Settings.settings b/libsecondlife/examples/Heightmap/Properties/Settings.settings similarity index 100% rename from libsecondlife-cs/examples/Heightmap/Properties/Settings.settings rename to libsecondlife/examples/Heightmap/Properties/Settings.settings diff --git a/libsecondlife-cs/examples/Heightmap/frmHeightmap.Designer.cs b/libsecondlife/examples/Heightmap/frmHeightmap.Designer.cs similarity index 100% rename from libsecondlife-cs/examples/Heightmap/frmHeightmap.Designer.cs rename to libsecondlife/examples/Heightmap/frmHeightmap.Designer.cs diff --git a/libsecondlife-cs/examples/Heightmap/frmHeightmap.cs b/libsecondlife/examples/Heightmap/frmHeightmap.cs similarity index 100% rename from libsecondlife-cs/examples/Heightmap/frmHeightmap.cs rename to libsecondlife/examples/Heightmap/frmHeightmap.cs diff --git a/libsecondlife-cs/examples/Heightmap/frmHeightmap.resx b/libsecondlife/examples/Heightmap/frmHeightmap.resx similarity index 100% rename from libsecondlife-cs/examples/Heightmap/frmHeightmap.resx rename to libsecondlife/examples/Heightmap/frmHeightmap.resx diff --git a/libsecondlife-cs/examples/IA_ImageTool/IA_ImageTool.csproj b/libsecondlife/examples/IA_ImageTool/IA_ImageTool.csproj similarity index 100% rename from libsecondlife-cs/examples/IA_ImageTool/IA_ImageTool.csproj rename to libsecondlife/examples/IA_ImageTool/IA_ImageTool.csproj diff --git a/libsecondlife-cs/examples/IA_ImageTool/ImageTool.cs b/libsecondlife/examples/IA_ImageTool/ImageTool.cs similarity index 98% rename from libsecondlife-cs/examples/IA_ImageTool/ImageTool.cs rename to libsecondlife/examples/IA_ImageTool/ImageTool.cs index 52795fe6..5d02d26b 100644 --- a/libsecondlife-cs/examples/IA_ImageTool/ImageTool.cs +++ b/libsecondlife/examples/IA_ImageTool/ImageTool.cs @@ -168,7 +168,7 @@ namespace IA_ImageTool return; } - if (!_Client.Inventory.GetRootFolder().RequestDownloadContents(true, false, false, false).RequestComplete.WaitOne(5000, false)) + if (!_Client.Inventory.GetRootFolder().RequestDownloadContents(true, false, false).RequestComplete.WaitOne(5000, false)) { Console.WriteLine("timeout while downloading root folders, aborting."); return; diff --git a/libsecondlife-cs/examples/IA_ImageTool/Properties/AssemblyInfo.cs b/libsecondlife/examples/IA_ImageTool/Properties/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/examples/IA_ImageTool/Properties/AssemblyInfo.cs rename to libsecondlife/examples/IA_ImageTool/Properties/AssemblyInfo.cs diff --git a/libsecondlife-cs/examples/IA_NotecardTool/IA_NotecardTool.csproj b/libsecondlife/examples/IA_NotecardTool/IA_NotecardTool.csproj similarity index 100% rename from libsecondlife-cs/examples/IA_NotecardTool/IA_NotecardTool.csproj rename to libsecondlife/examples/IA_NotecardTool/IA_NotecardTool.csproj diff --git a/libsecondlife-cs/examples/IA_NotecardTool/MoreSamples.txt b/libsecondlife/examples/IA_NotecardTool/MoreSamples.txt similarity index 100% rename from libsecondlife-cs/examples/IA_NotecardTool/MoreSamples.txt rename to libsecondlife/examples/IA_NotecardTool/MoreSamples.txt diff --git a/libsecondlife-cs/examples/IA_NotecardTool/NotecardTool.cs b/libsecondlife/examples/IA_NotecardTool/NotecardTool.cs similarity index 100% rename from libsecondlife-cs/examples/IA_NotecardTool/NotecardTool.cs rename to libsecondlife/examples/IA_NotecardTool/NotecardTool.cs diff --git a/libsecondlife-cs/examples/IA_NotecardTool/Properties/AssemblyInfo.cs b/libsecondlife/examples/IA_NotecardTool/Properties/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/examples/IA_NotecardTool/Properties/AssemblyInfo.cs rename to libsecondlife/examples/IA_NotecardTool/Properties/AssemblyInfo.cs diff --git a/libsecondlife-cs/examples/IA_SimpleInventory/IA_SimpleInventory.cs b/libsecondlife/examples/IA_SimpleInventory/IA_SimpleInventory.cs similarity index 100% rename from libsecondlife-cs/examples/IA_SimpleInventory/IA_SimpleInventory.cs rename to libsecondlife/examples/IA_SimpleInventory/IA_SimpleInventory.cs diff --git a/libsecondlife-cs/examples/IA_SimpleInventory/IA_SimpleInventory.csproj b/libsecondlife/examples/IA_SimpleInventory/IA_SimpleInventory.csproj similarity index 100% rename from libsecondlife-cs/examples/IA_SimpleInventory/IA_SimpleInventory.csproj rename to libsecondlife/examples/IA_SimpleInventory/IA_SimpleInventory.csproj diff --git a/libsecondlife-cs/examples/IA_SimpleInventory/Properties/AssemblyInfo.cs b/libsecondlife/examples/IA_SimpleInventory/Properties/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/examples/IA_SimpleInventory/Properties/AssemblyInfo.cs rename to libsecondlife/examples/IA_SimpleInventory/Properties/AssemblyInfo.cs diff --git a/libsecondlife-cs/examples/Key2Name/key2name.cs b/libsecondlife/examples/Key2Name/key2name.cs similarity index 100% rename from libsecondlife-cs/examples/Key2Name/key2name.cs rename to libsecondlife/examples/Key2Name/key2name.cs diff --git a/libsecondlife-cs/examples/Teleport/Properties/AssemblyInfo.cs b/libsecondlife/examples/Teleport/Properties/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/examples/Teleport/Properties/AssemblyInfo.cs rename to libsecondlife/examples/Teleport/Properties/AssemblyInfo.cs diff --git a/libsecondlife-cs/examples/Teleport/Teleport.cs b/libsecondlife/examples/Teleport/Teleport.cs similarity index 100% rename from libsecondlife-cs/examples/Teleport/Teleport.cs rename to libsecondlife/examples/Teleport/Teleport.cs diff --git a/libsecondlife-cs/examples/Teleport/Teleport.csproj b/libsecondlife/examples/Teleport/Teleport.csproj similarity index 100% rename from libsecondlife-cs/examples/Teleport/Teleport.csproj rename to libsecondlife/examples/Teleport/Teleport.csproj diff --git a/libsecondlife-cs/examples/TestClient/Arguments.cs b/libsecondlife/examples/TestClient/Arguments.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Arguments.cs rename to libsecondlife/examples/TestClient/Arguments.cs diff --git a/libsecondlife-cs/examples/TestClient/ClientManager.cs b/libsecondlife/examples/TestClient/ClientManager.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/ClientManager.cs rename to libsecondlife/examples/TestClient/ClientManager.cs diff --git a/libsecondlife-cs/examples/TestClient/Command.cs b/libsecondlife/examples/TestClient/Command.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Command.cs rename to libsecondlife/examples/TestClient/Command.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/AppearanceCommand.cs b/libsecondlife/examples/TestClient/Commands/AppearanceCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/AppearanceCommand.cs rename to libsecondlife/examples/TestClient/Commands/AppearanceCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/CloneProfileCommand.cs b/libsecondlife/examples/TestClient/Commands/CloneProfileCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/CloneProfileCommand.cs rename to libsecondlife/examples/TestClient/Commands/CloneProfileCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Communication/EchoMasterCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/EchoMasterCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Communication/EchoMasterCommand.cs rename to libsecondlife/examples/TestClient/Commands/Communication/EchoMasterCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Communication/IMCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/IMCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Communication/IMCommand.cs rename to libsecondlife/examples/TestClient/Commands/Communication/IMCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Communication/SayCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/SayCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Communication/SayCommand.cs rename to libsecondlife/examples/TestClient/Commands/Communication/SayCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Communication/ShoutCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/ShoutCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Communication/ShoutCommand.cs rename to libsecondlife/examples/TestClient/Commands/Communication/ShoutCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Communication/TtsCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/TtsCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Communication/TtsCommand.cs rename to libsecondlife/examples/TestClient/Commands/Communication/TtsCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Communication/WhisperCommand.cs b/libsecondlife/examples/TestClient/Commands/Communication/WhisperCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Communication/WhisperCommand.cs rename to libsecondlife/examples/TestClient/Commands/Communication/WhisperCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/DebugCommand.cs b/libsecondlife/examples/TestClient/Commands/DebugCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/DebugCommand.cs rename to libsecondlife/examples/TestClient/Commands/DebugCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/DilationCommand.cs b/libsecondlife/examples/TestClient/Commands/DilationCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/DilationCommand.cs rename to libsecondlife/examples/TestClient/Commands/DilationCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/DumpOutfitCommand.cs b/libsecondlife/examples/TestClient/Commands/DumpOutfitCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/DumpOutfitCommand.cs rename to libsecondlife/examples/TestClient/Commands/DumpOutfitCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/ExportCommand.cs b/libsecondlife/examples/TestClient/Commands/ExportCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/ExportCommand.cs rename to libsecondlife/examples/TestClient/Commands/ExportCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/ExportOutfitCommand.cs b/libsecondlife/examples/TestClient/Commands/ExportOutfitCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/ExportOutfitCommand.cs rename to libsecondlife/examples/TestClient/Commands/ExportOutfitCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/ExportParticlesCommand.cs b/libsecondlife/examples/TestClient/Commands/ExportParticlesCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/ExportParticlesCommand.cs rename to libsecondlife/examples/TestClient/Commands/ExportParticlesCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/FindSimCommand.cs b/libsecondlife/examples/TestClient/Commands/FindSimCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/FindSimCommand.cs rename to libsecondlife/examples/TestClient/Commands/FindSimCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/HelpCommand.cs b/libsecondlife/examples/TestClient/Commands/HelpCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/HelpCommand.cs rename to libsecondlife/examples/TestClient/Commands/HelpCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/ImportCommand.cs b/libsecondlife/examples/TestClient/Commands/ImportCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/ImportCommand.cs rename to libsecondlife/examples/TestClient/Commands/ImportCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/ImportOutfitCommand.cs b/libsecondlife/examples/TestClient/Commands/ImportOutfitCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/ImportOutfitCommand.cs rename to libsecondlife/examples/TestClient/Commands/ImportOutfitCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Inventory/BalanceCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/BalanceCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Inventory/BalanceCommand.cs rename to libsecondlife/examples/TestClient/Commands/Inventory/BalanceCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs rename to libsecondlife/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Inventory/GiveAllCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/GiveAllCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Inventory/GiveAllCommand.cs rename to libsecondlife/examples/TestClient/Commands/Inventory/GiveAllCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Inventory/InventoryCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/InventoryCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Inventory/InventoryCommand.cs rename to libsecondlife/examples/TestClient/Commands/Inventory/InventoryCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Inventory/WearCommand.cs b/libsecondlife/examples/TestClient/Commands/Inventory/WearCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Inventory/WearCommand.cs rename to libsecondlife/examples/TestClient/Commands/Inventory/WearCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/LoadCommand.cs b/libsecondlife/examples/TestClient/Commands/LoadCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/LoadCommand.cs rename to libsecondlife/examples/TestClient/Commands/LoadCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/LoginCommand.cs b/libsecondlife/examples/TestClient/Commands/LoginCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/LoginCommand.cs rename to libsecondlife/examples/TestClient/Commands/LoginCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/LogoutCommand.cs b/libsecondlife/examples/TestClient/Commands/LogoutCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/LogoutCommand.cs rename to libsecondlife/examples/TestClient/Commands/LogoutCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/MD5Command.cs b/libsecondlife/examples/TestClient/Commands/MD5Command.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/MD5Command.cs rename to libsecondlife/examples/TestClient/Commands/MD5Command.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Movement/FollowCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/FollowCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Movement/FollowCommand.cs rename to libsecondlife/examples/TestClient/Commands/Movement/FollowCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Movement/GotoCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/GotoCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Movement/GotoCommand.cs rename to libsecondlife/examples/TestClient/Commands/Movement/GotoCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Movement/JumpCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/JumpCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Movement/JumpCommand.cs rename to libsecondlife/examples/TestClient/Commands/Movement/JumpCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Movement/LocationCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/LocationCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Movement/LocationCommand.cs rename to libsecondlife/examples/TestClient/Commands/Movement/LocationCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Movement/MoveToCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/MoveToCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Movement/MoveToCommand.cs rename to libsecondlife/examples/TestClient/Commands/Movement/MoveToCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Movement/SitCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/SitCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Movement/SitCommand.cs rename to libsecondlife/examples/TestClient/Commands/Movement/SitCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Movement/SitOnCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/SitOnCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Movement/SitOnCommand.cs rename to libsecondlife/examples/TestClient/Commands/Movement/SitOnCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/Movement/StandCommand.cs b/libsecondlife/examples/TestClient/Commands/Movement/StandCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/Movement/StandCommand.cs rename to libsecondlife/examples/TestClient/Commands/Movement/StandCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/PacketLogCommand.cs b/libsecondlife/examples/TestClient/Commands/PacketLogCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/PacketLogCommand.cs rename to libsecondlife/examples/TestClient/Commands/PacketLogCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/ParcelInfoCommand.cs b/libsecondlife/examples/TestClient/Commands/ParcelInfoCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/ParcelInfoCommand.cs rename to libsecondlife/examples/TestClient/Commands/ParcelInfoCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/PrimCountCommand.cs b/libsecondlife/examples/TestClient/Commands/PrimCountCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/PrimCountCommand.cs rename to libsecondlife/examples/TestClient/Commands/PrimCountCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/QuitCommand.cs b/libsecondlife/examples/TestClient/Commands/QuitCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/QuitCommand.cs rename to libsecondlife/examples/TestClient/Commands/QuitCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/SetMasterCommand.cs b/libsecondlife/examples/TestClient/Commands/SetMasterCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/SetMasterCommand.cs rename to libsecondlife/examples/TestClient/Commands/SetMasterCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/TouchCommand.cs b/libsecondlife/examples/TestClient/Commands/TouchCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/TouchCommand.cs rename to libsecondlife/examples/TestClient/Commands/TouchCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/TreeCommand.cs b/libsecondlife/examples/TestClient/Commands/TreeCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/TreeCommand.cs rename to libsecondlife/examples/TestClient/Commands/TreeCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/UptimeCommand.cs b/libsecondlife/examples/TestClient/Commands/UptimeCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/UptimeCommand.cs rename to libsecondlife/examples/TestClient/Commands/UptimeCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Commands/WhoCommand.cs b/libsecondlife/examples/TestClient/Commands/WhoCommand.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Commands/WhoCommand.cs rename to libsecondlife/examples/TestClient/Commands/WhoCommand.cs diff --git a/libsecondlife-cs/examples/TestClient/Parsing.cs b/libsecondlife/examples/TestClient/Parsing.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Parsing.cs rename to libsecondlife/examples/TestClient/Parsing.cs diff --git a/libsecondlife-cs/examples/TestClient/Program.cs b/libsecondlife/examples/TestClient/Program.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Program.cs rename to libsecondlife/examples/TestClient/Program.cs diff --git a/libsecondlife-cs/examples/TestClient/Properties/AssemblyInfo.cs b/libsecondlife/examples/TestClient/Properties/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/Properties/AssemblyInfo.cs rename to libsecondlife/examples/TestClient/Properties/AssemblyInfo.cs diff --git a/libsecondlife-cs/examples/TestClient/TestClient.build b/libsecondlife/examples/TestClient/TestClient.build similarity index 100% rename from libsecondlife-cs/examples/TestClient/TestClient.build rename to libsecondlife/examples/TestClient/TestClient.build diff --git a/libsecondlife-cs/examples/TestClient/TestClient.cs b/libsecondlife/examples/TestClient/TestClient.cs similarity index 100% rename from libsecondlife-cs/examples/TestClient/TestClient.cs rename to libsecondlife/examples/TestClient/TestClient.cs diff --git a/libsecondlife-cs/examples/TestClient/TestClient.csproj b/libsecondlife/examples/TestClient/TestClient.csproj similarity index 100% rename from libsecondlife-cs/examples/TestClient/TestClient.csproj rename to libsecondlife/examples/TestClient/TestClient.csproj diff --git a/libsecondlife-cs/examples/examples.build b/libsecondlife/examples/examples.build similarity index 100% rename from libsecondlife-cs/examples/examples.build rename to libsecondlife/examples/examples.build diff --git a/libsecondlife-cs/examples/groupmanager/App.ico b/libsecondlife/examples/groupmanager/App.ico similarity index 100% rename from libsecondlife-cs/examples/groupmanager/App.ico rename to libsecondlife/examples/groupmanager/App.ico diff --git a/libsecondlife-cs/examples/groupmanager/frmGroupInfo.Designer.cs b/libsecondlife/examples/groupmanager/frmGroupInfo.Designer.cs similarity index 100% rename from libsecondlife-cs/examples/groupmanager/frmGroupInfo.Designer.cs rename to libsecondlife/examples/groupmanager/frmGroupInfo.Designer.cs diff --git a/libsecondlife-cs/examples/groupmanager/frmGroupInfo.cs b/libsecondlife/examples/groupmanager/frmGroupInfo.cs similarity index 100% rename from libsecondlife-cs/examples/groupmanager/frmGroupInfo.cs rename to libsecondlife/examples/groupmanager/frmGroupInfo.cs diff --git a/libsecondlife-cs/examples/groupmanager/frmGroupInfo.resx b/libsecondlife/examples/groupmanager/frmGroupInfo.resx similarity index 100% rename from libsecondlife-cs/examples/groupmanager/frmGroupInfo.resx rename to libsecondlife/examples/groupmanager/frmGroupInfo.resx diff --git a/libsecondlife-cs/examples/groupmanager/frmGroupManager.Designer.cs b/libsecondlife/examples/groupmanager/frmGroupManager.Designer.cs similarity index 100% rename from libsecondlife-cs/examples/groupmanager/frmGroupManager.Designer.cs rename to libsecondlife/examples/groupmanager/frmGroupManager.Designer.cs diff --git a/libsecondlife-cs/examples/groupmanager/frmGroupManager.cs b/libsecondlife/examples/groupmanager/frmGroupManager.cs similarity index 100% rename from libsecondlife-cs/examples/groupmanager/frmGroupManager.cs rename to libsecondlife/examples/groupmanager/frmGroupManager.cs diff --git a/libsecondlife-cs/examples/groupmanager/frmGroupManager.resx b/libsecondlife/examples/groupmanager/frmGroupManager.resx similarity index 100% rename from libsecondlife-cs/examples/groupmanager/frmGroupManager.resx rename to libsecondlife/examples/groupmanager/frmGroupManager.resx diff --git a/libsecondlife-cs/examples/groupmanager/groupmanager.csproj b/libsecondlife/examples/groupmanager/groupmanager.csproj similarity index 100% rename from libsecondlife-cs/examples/groupmanager/groupmanager.csproj rename to libsecondlife/examples/groupmanager/groupmanager.csproj diff --git a/libsecondlife-cs/examples/name2key/name2key.cs b/libsecondlife/examples/name2key/name2key.cs similarity index 100% rename from libsecondlife-cs/examples/name2key/name2key.cs rename to libsecondlife/examples/name2key/name2key.cs diff --git a/libsecondlife-cs/examples/name2key/name2key.csproj b/libsecondlife/examples/name2key/name2key.csproj similarity index 100% rename from libsecondlife-cs/examples/name2key/name2key.csproj rename to libsecondlife/examples/name2key/name2key.csproj diff --git a/libsecondlife-cs/examples/primexport/frmPrimExport.cs b/libsecondlife/examples/primexport/frmPrimExport.cs similarity index 100% rename from libsecondlife-cs/examples/primexport/frmPrimExport.cs rename to libsecondlife/examples/primexport/frmPrimExport.cs diff --git a/libsecondlife-cs/examples/primexport/frmPrimExport.resx b/libsecondlife/examples/primexport/frmPrimExport.resx similarity index 100% rename from libsecondlife-cs/examples/primexport/frmPrimExport.resx rename to libsecondlife/examples/primexport/frmPrimExport.resx diff --git a/libsecondlife-cs/examples/primexport/primexport.csproj b/libsecondlife/examples/primexport/primexport.csproj similarity index 100% rename from libsecondlife-cs/examples/primexport/primexport.csproj rename to libsecondlife/examples/primexport/primexport.csproj diff --git a/libsecondlife-cs/examples/slaccountant/App.ico b/libsecondlife/examples/slaccountant/App.ico similarity index 100% rename from libsecondlife-cs/examples/slaccountant/App.ico rename to libsecondlife/examples/slaccountant/App.ico diff --git a/libsecondlife-cs/examples/slaccountant/AssemblyInfo.cs b/libsecondlife/examples/slaccountant/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/examples/slaccountant/AssemblyInfo.cs rename to libsecondlife/examples/slaccountant/AssemblyInfo.cs diff --git a/libsecondlife-cs/examples/slaccountant/frmSLAccountant.cs b/libsecondlife/examples/slaccountant/frmSLAccountant.cs similarity index 100% rename from libsecondlife-cs/examples/slaccountant/frmSLAccountant.cs rename to libsecondlife/examples/slaccountant/frmSLAccountant.cs diff --git a/libsecondlife-cs/examples/slaccountant/frmSLAccountant.resx b/libsecondlife/examples/slaccountant/frmSLAccountant.resx similarity index 100% rename from libsecondlife-cs/examples/slaccountant/frmSLAccountant.resx rename to libsecondlife/examples/slaccountant/frmSLAccountant.resx diff --git a/libsecondlife-cs/examples/slaccountant/slaccountant.csproj b/libsecondlife/examples/slaccountant/slaccountant.csproj similarity index 100% rename from libsecondlife-cs/examples/slaccountant/slaccountant.csproj rename to libsecondlife/examples/slaccountant/slaccountant.csproj diff --git a/libsecondlife-cs/examples/sldump/sldump.cs b/libsecondlife/examples/sldump/sldump.cs similarity index 100% rename from libsecondlife-cs/examples/sldump/sldump.cs rename to libsecondlife/examples/sldump/sldump.cs diff --git a/libsecondlife-cs/examples/sldump/sldump.csproj b/libsecondlife/examples/sldump/sldump.csproj similarity index 100% rename from libsecondlife-cs/examples/sldump/sldump.csproj rename to libsecondlife/examples/sldump/sldump.csproj diff --git a/libsecondlife-cs/libsecondlife.Tests/NetworkTests.cs b/libsecondlife/libsecondlife.Tests/NetworkTests.cs similarity index 100% rename from libsecondlife-cs/libsecondlife.Tests/NetworkTests.cs rename to libsecondlife/libsecondlife.Tests/NetworkTests.cs diff --git a/libsecondlife-cs/libsecondlife.Tests/PacketTests.cs b/libsecondlife/libsecondlife.Tests/PacketTests.cs similarity index 100% rename from libsecondlife-cs/libsecondlife.Tests/PacketTests.cs rename to libsecondlife/libsecondlife.Tests/PacketTests.cs diff --git a/libsecondlife-cs/libsecondlife.Tests/PrimObjectTests.cs b/libsecondlife/libsecondlife.Tests/PrimObjectTests.cs similarity index 100% rename from libsecondlife-cs/libsecondlife.Tests/PrimObjectTests.cs rename to libsecondlife/libsecondlife.Tests/PrimObjectTests.cs diff --git a/libsecondlife-cs/libsecondlife.Tests/TypeTests.cs b/libsecondlife/libsecondlife.Tests/TypeTests.cs similarity index 100% rename from libsecondlife-cs/libsecondlife.Tests/TypeTests.cs rename to libsecondlife/libsecondlife.Tests/TypeTests.cs diff --git a/libsecondlife-cs/libsecondlife.Tests/libsecondlife.Tests.csproj b/libsecondlife/libsecondlife.Tests/libsecondlife.Tests.csproj similarity index 100% rename from libsecondlife-cs/libsecondlife.Tests/libsecondlife.Tests.csproj rename to libsecondlife/libsecondlife.Tests/libsecondlife.Tests.csproj diff --git a/libsecondlife-cs/libsecondlife.Tests/libsecondlife.Tests.mdp b/libsecondlife/libsecondlife.Tests/libsecondlife.Tests.mdp similarity index 100% rename from libsecondlife-cs/libsecondlife.Tests/libsecondlife.Tests.mdp rename to libsecondlife/libsecondlife.Tests/libsecondlife.Tests.mdp diff --git a/libsecondlife-cs/libsecondlife.Tests/libsecondlife.Tests.sln b/libsecondlife/libsecondlife.Tests/libsecondlife.Tests.sln similarity index 100% rename from libsecondlife-cs/libsecondlife.Tests/libsecondlife.Tests.sln rename to libsecondlife/libsecondlife.Tests/libsecondlife.Tests.sln diff --git a/libsecondlife-cs/libsecondlife.Utilities/Appearance.cs b/libsecondlife/libsecondlife.Utilities/Appearance.cs similarity index 100% rename from libsecondlife-cs/libsecondlife.Utilities/Appearance.cs rename to libsecondlife/libsecondlife.Utilities/Appearance.cs diff --git a/libsecondlife-cs/libsecondlife.Utilities/Assets.cs b/libsecondlife/libsecondlife.Utilities/Assets.cs similarity index 100% rename from libsecondlife-cs/libsecondlife.Utilities/Assets.cs rename to libsecondlife/libsecondlife.Utilities/Assets.cs diff --git a/libsecondlife-cs/libsecondlife.Utilities/Inventory.cs b/libsecondlife/libsecondlife.Utilities/Inventory.cs similarity index 100% rename from libsecondlife-cs/libsecondlife.Utilities/Inventory.cs rename to libsecondlife/libsecondlife.Utilities/Inventory.cs diff --git a/libsecondlife-cs/libsecondlife.Utilities/Properties/AssemblyInfo.cs b/libsecondlife/libsecondlife.Utilities/Properties/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/libsecondlife.Utilities/Properties/AssemblyInfo.cs rename to libsecondlife/libsecondlife.Utilities/Properties/AssemblyInfo.cs diff --git a/libsecondlife-cs/libsecondlife.Utilities/Utilities.cs b/libsecondlife/libsecondlife.Utilities/Utilities.cs similarity index 100% rename from libsecondlife-cs/libsecondlife.Utilities/Utilities.cs rename to libsecondlife/libsecondlife.Utilities/Utilities.cs diff --git a/libsecondlife-cs/libsecondlife.Utilities/libsecondlife.Utilities.csproj b/libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.csproj similarity index 100% rename from libsecondlife-cs/libsecondlife.Utilities/libsecondlife.Utilities.csproj rename to libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.csproj diff --git a/libsecondlife-cs/libsecondlife.Utilities/libsecondlife.Utilities.mdp b/libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.mdp similarity index 100% rename from libsecondlife-cs/libsecondlife.Utilities/libsecondlife.Utilities.mdp rename to libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.mdp diff --git a/libsecondlife-cs/libsecondlife.build b/libsecondlife/libsecondlife.build similarity index 100% rename from libsecondlife-cs/libsecondlife.build rename to libsecondlife/libsecondlife.build diff --git a/libsecondlife-cs/libsecondlife.csproj b/libsecondlife/libsecondlife.csproj similarity index 100% rename from libsecondlife-cs/libsecondlife.csproj rename to libsecondlife/libsecondlife.csproj diff --git a/libsecondlife-cs/libsecondlife.mdp b/libsecondlife/libsecondlife.mdp similarity index 100% rename from libsecondlife-cs/libsecondlife.mdp rename to libsecondlife/libsecondlife.mdp diff --git a/libsecondlife-cs/libsecondlife.mds b/libsecondlife/libsecondlife.mds similarity index 100% rename from libsecondlife-cs/libsecondlife.mds rename to libsecondlife/libsecondlife.mds diff --git a/libsecondlife-cs/libsecondlife.sln b/libsecondlife/libsecondlife.sln similarity index 78% rename from libsecondlife-cs/libsecondlife.sln rename to libsecondlife/libsecondlife.sln index 1206a52d..d6e6fe62 100644 --- a/libsecondlife-cs/libsecondlife.sln +++ b/libsecondlife/libsecondlife.sln @@ -1,52 +1,136 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsecondlife", "libsecondlife.csproj", "{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sldump", "examples\sldump\sldump.csproj", "{F6258A68-C624-46A0-BA73-B55D21BB0A3B}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "slaccountant", "examples\slaccountant\slaccountant.csproj", "{FC19D5F6-076E-4923-8456-9B0E00E22896}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "name2key", "examples\name2key\name2key.csproj", "{66FFD34E-652C-4EF5-81FE-06AD011169D2}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "primexport", "examples\primexport\primexport.csproj", "{77E5330D-8A8C-41B4-A2D1-6F06FE45ED6D}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mapgenerator", "mapgenerator\mapgenerator.csproj", "{C59B1312-57EF-4146-B6B2-1C7B6DC4638B}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IA_SimpleInventory", "examples\IA_SimpleInventory\IA_SimpleInventory.csproj", "{E464B963-46E3-4E1A-A36F-9C640C880E68}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IA_NotecardTool", "examples\IA_NotecardTool\IA_NotecardTool.csproj", "{E185E4E1-62D2-430C-A94C-E8E38190805B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Teleport", "examples\Teleport\Teleport.csproj", "{B5AC6795-E426-4BC3-950F-D7B2970E2394}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Decoder", "..\applications\Decoder\Decoder.csproj", "{7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IA_ImageTool", "examples\IA_ImageTool\IA_ImageTool.csproj", "{8D2E5240-2247-42F5-AAAC-CF0CCCEE349A}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "groupmanager", "examples\groupmanager\groupmanager.csproj", "{F460FAB3-0D12-4873-89EB-2696818764B8}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "examples\TestClient\TestClient.csproj", "{B87682F6-B2D7-4C4D-A529-400C24FD4880}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsecondlife.Utilities", "libsecondlife.Utilities\libsecondlife.Utilities.csproj", "{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsecondlife.Tests", "libsecondlife.Tests\libsecondlife.Tests.csproj", "{E0BCBBAE-A620-431A-9EB7-30173EAF195B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecondGlance", "..\applications\SecondGlance\SecondGlance.csproj", "{D72C92D1-559A-48A7-93F5-99F4E99F3F98}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLProxy", "..\applications\SLProxy\SLProxy.csproj", "{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Analyst", "..\applications\SLProxy\Analyst.csproj", "{6222B134-AE5F-489A-8A77-423A721B7C62}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatConsole", "..\applications\SLProxy\ChatConsole.csproj", "{D8ECCBE1-AC71-4054-AAA6-2D50E5629504}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualParamGenerator", "VisualParamGenerator\VisualParamGenerator.csproj", "{D2A514C5-5590-4789-9032-6E5B4C297B80}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openjpegnet", "..\openjpegnet\openjpegnet.csproj", "{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Heightmap", "examples\Heightmap\Heightmap.csproj", "{D9669D08-AC81-4F45-AD23-82787C6EFBBA}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "key2name", "examples\Key2Name\key2name.csproj", "{4FF68142-9C61-42D1-87DC-5D37CB671C29}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "landcollector", "..\landcollector\landcollector.csproj", "{6941C570-83A2-4981-BE7A-55ED6ABB88FA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baker", "examples\Baker\Baker.csproj", "{4A32A4E5-717C-4B60-B3D7-704518684893}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Decoder", "..\Decoder\Decoder.csproj", "{7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecondGlance", "..\SecondGlance\SecondGlance.csproj", "{D72C92D1-559A-48A7-93F5-99F4E99F3F98}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLProxy", "..\SLProxy\SLProxy.csproj", "{E4115DC9-FC88-47D6-B3B6-2400AD19B80D}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatConsole", "..\SLProxy\ChatConsole.csproj", "{D8ECCBE1-AC71-4054-AAA6-2D50E5629504}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -106,18 +190,6 @@ Global {E185E4E1-62D2-430C-A94C-E8E38190805B}.Release|.NET 1.1.ActiveCfg = Release|Any CPU {E185E4E1-62D2-430C-A94C-E8E38190805B}.Release|Any CPU.ActiveCfg = Release|Any CPU {E185E4E1-62D2-430C-A94C-E8E38190805B}.Release|Any CPU.Build.0 = Release|Any CPU - {B5AC6795-E426-4BC3-950F-D7B2970E2394}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU - {B5AC6795-E426-4BC3-950F-D7B2970E2394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5AC6795-E426-4BC3-950F-D7B2970E2394}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5AC6795-E426-4BC3-950F-D7B2970E2394}.Release|.NET 1.1.ActiveCfg = Release|Any CPU - {B5AC6795-E426-4BC3-950F-D7B2970E2394}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5AC6795-E426-4BC3-950F-D7B2970E2394}.Release|Any CPU.Build.0 = Release|Any CPU - {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU - {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Release|.NET 1.1.ActiveCfg = Release|Any CPU - {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Release|Any CPU.Build.0 = Release|Any CPU {8D2E5240-2247-42F5-AAAC-CF0CCCEE349A}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU {8D2E5240-2247-42F5-AAAC-CF0CCCEE349A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D2E5240-2247-42F5-AAAC-CF0CCCEE349A}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -148,30 +220,6 @@ Global {E0BCBBAE-A620-431A-9EB7-30173EAF195B}.Release|.NET 1.1.Build.0 = Release|.NET 1.1 {E0BCBBAE-A620-431A-9EB7-30173EAF195B}.Release|Any CPU.ActiveCfg = Release|Any CPU {E0BCBBAE-A620-431A-9EB7-30173EAF195B}.Release|Any CPU.Build.0 = Release|Any CPU - {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU - {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Release|.NET 1.1.ActiveCfg = Release|Any CPU - {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Release|Any CPU.Build.0 = Release|Any CPU - {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU - {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Release|.NET 1.1.ActiveCfg = Release|Any CPU - {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Release|Any CPU.Build.0 = Release|Any CPU - {6222B134-AE5F-489A-8A77-423A721B7C62}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU - {6222B134-AE5F-489A-8A77-423A721B7C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6222B134-AE5F-489A-8A77-423A721B7C62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6222B134-AE5F-489A-8A77-423A721B7C62}.Release|.NET 1.1.ActiveCfg = Release|Any CPU - {6222B134-AE5F-489A-8A77-423A721B7C62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6222B134-AE5F-489A-8A77-423A721B7C62}.Release|Any CPU.Build.0 = Release|Any CPU - {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU - {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Release|.NET 1.1.ActiveCfg = Release|Any CPU - {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Release|Any CPU.Build.0 = Release|Any CPU {D2A514C5-5590-4789-9032-6E5B4C297B80}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU {D2A514C5-5590-4789-9032-6E5B4C297B80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D2A514C5-5590-4789-9032-6E5B4C297B80}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -196,12 +244,36 @@ Global {4FF68142-9C61-42D1-87DC-5D37CB671C29}.Release|.NET 1.1.ActiveCfg = Release|Any CPU {4FF68142-9C61-42D1-87DC-5D37CB671C29}.Release|Any CPU.ActiveCfg = Release|Any CPU {4FF68142-9C61-42D1-87DC-5D37CB671C29}.Release|Any CPU.Build.0 = Release|Any CPU - {6941C570-83A2-4981-BE7A-55ED6ABB88FA}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU - {6941C570-83A2-4981-BE7A-55ED6ABB88FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6941C570-83A2-4981-BE7A-55ED6ABB88FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6941C570-83A2-4981-BE7A-55ED6ABB88FA}.Release|.NET 1.1.ActiveCfg = Release|Any CPU - {6941C570-83A2-4981-BE7A-55ED6ABB88FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6941C570-83A2-4981-BE7A-55ED6ABB88FA}.Release|Any CPU.Build.0 = Release|Any CPU + {4A32A4E5-717C-4B60-B3D7-704518684893}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU + {4A32A4E5-717C-4B60-B3D7-704518684893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A32A4E5-717C-4B60-B3D7-704518684893}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A32A4E5-717C-4B60-B3D7-704518684893}.Release|.NET 1.1.ActiveCfg = Release|Any CPU + {4A32A4E5-717C-4B60-B3D7-704518684893}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A32A4E5-717C-4B60-B3D7-704518684893}.Release|Any CPU.Build.0 = Release|Any CPU + {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU + {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Release|.NET 1.1.ActiveCfg = Release|Any CPU + {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7AE16AC1-E64C-4FDC-9B85-4BB6145D511C}.Release|Any CPU.Build.0 = Release|Any CPU + {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU + {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Release|.NET 1.1.ActiveCfg = Release|Any CPU + {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D72C92D1-559A-48A7-93F5-99F4E99F3F98}.Release|Any CPU.Build.0 = Release|Any CPU + {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU + {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Release|.NET 1.1.ActiveCfg = Release|Any CPU + {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E4115DC9-FC88-47D6-B3B6-2400AD19B80D}.Release|Any CPU.Build.0 = Release|Any CPU + {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU + {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Release|.NET 1.1.ActiveCfg = Release|Any CPU + {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D8ECCBE1-AC71-4054-AAA6-2D50E5629504}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/libsecondlife-cs/mapgenerator/Properties/AssemblyInfo.cs b/libsecondlife/mapgenerator/Properties/AssemblyInfo.cs similarity index 100% rename from libsecondlife-cs/mapgenerator/Properties/AssemblyInfo.cs rename to libsecondlife/mapgenerator/Properties/AssemblyInfo.cs diff --git a/libsecondlife-cs/mapgenerator/ProtocolManager.cs b/libsecondlife/mapgenerator/ProtocolManager.cs similarity index 100% rename from libsecondlife-cs/mapgenerator/ProtocolManager.cs rename to libsecondlife/mapgenerator/ProtocolManager.cs diff --git a/libsecondlife-cs/mapgenerator/mapgenerator.cs b/libsecondlife/mapgenerator/mapgenerator.cs similarity index 100% rename from libsecondlife-cs/mapgenerator/mapgenerator.cs rename to libsecondlife/mapgenerator/mapgenerator.cs diff --git a/libsecondlife-cs/mapgenerator/mapgenerator.csproj b/libsecondlife/mapgenerator/mapgenerator.csproj similarity index 100% rename from libsecondlife-cs/mapgenerator/mapgenerator.csproj rename to libsecondlife/mapgenerator/mapgenerator.csproj diff --git a/libsecondlife-cs/mapgenerator/mapgenerator.sln b/libsecondlife/mapgenerator/mapgenerator.sln similarity index 100% rename from libsecondlife-cs/mapgenerator/mapgenerator.sln rename to libsecondlife/mapgenerator/mapgenerator.sln diff --git a/libsecondlife-cs/mapgenerator/template.cs b/libsecondlife/mapgenerator/template.cs similarity index 100% rename from libsecondlife-cs/mapgenerator/template.cs rename to libsecondlife/mapgenerator/template.cs diff --git a/libsecondlife-cs/mapgenerator/unusedpackets.txt b/libsecondlife/mapgenerator/unusedpackets.txt similarity index 100% rename from libsecondlife-cs/mapgenerator/unusedpackets.txt rename to libsecondlife/mapgenerator/unusedpackets.txt diff --git a/applications/libslupdater/Properties/AssemblyInfo.cs b/libslupdater/Properties/AssemblyInfo.cs similarity index 100% rename from applications/libslupdater/Properties/AssemblyInfo.cs rename to libslupdater/Properties/AssemblyInfo.cs diff --git a/applications/libslupdater/libslupdater.cs b/libslupdater/libslupdater.cs similarity index 100% rename from applications/libslupdater/libslupdater.cs rename to libslupdater/libslupdater.cs diff --git a/applications/libslupdater/libslupdater.csproj b/libslupdater/libslupdater.csproj similarity index 100% rename from applications/libslupdater/libslupdater.csproj rename to libslupdater/libslupdater.csproj diff --git a/applications/libslupdater/libslupdater.sln b/libslupdater/libslupdater.sln similarity index 100% rename from applications/libslupdater/libslupdater.sln rename to libslupdater/libslupdater.sln