aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenGridServices.GridServer/OpenGridServices.GridServer.csproj2
-rw-r--r--OpenGridServices.UserServer/OpenGridServices.UserServer.csproj42
-rw-r--r--OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build1
-rw-r--r--OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj6
-rw-r--r--OpenSim.Framework.Console/OpenSim.Framework.Console.csproj2
-rw-r--r--OpenSim.Framework/OpenSim.Framework.csproj2
-rw-r--r--OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj6
-rw-r--r--OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj6
-rw-r--r--OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj4
-rw-r--r--OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj4
-rw-r--r--OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj4
-rw-r--r--OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj4
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.csproj58
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj6
-rw-r--r--OpenSim.build11
-rw-r--r--OpenSim.sln146
-rw-r--r--OpenSim/OpenSim.csproj10
-rw-r--r--Prebuild/Prebuild.sln10
-rw-r--r--Prebuild/src/Prebuild.csproj2
-rw-r--r--Servers/CapsHttpServer.cs332
-rw-r--r--Servers/OpenSim.Servers.csproj5
-rw-r--r--Servers/OpenSim.Servers.dll.build1
-rw-r--r--prebuild.xml4
23 files changed, 167 insertions, 501 deletions
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
index 856505f..b684fe4 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{3378EE78-2D72-4C21-8F9D-680B33AAFFEE}</ProjectGuid> 6 <ProjectGuid>{50CB0968-2DB8-4293-8AC0-7543C796B88D}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index 1b67165..bcd5077 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
@@ -1,13 +1,12 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{36895293-A627-42EC-BA77-6AF6F5A4A7DF}</ProjectGuid> 6 <ProjectGuid>{E198DB67-006C-4E76-8D5B-8DD09E91EE2A}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenGridServices.UserServer</AssemblyName> 12 <AssemblyName>OpenGridServices.UserServer</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Exe</OutputType> 17 <OutputType>Exe</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenGridServices.UserServer</RootNamespace> 19 <RootNamespace>OpenGridServices.UserServer</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,31 +55,30 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="System"> 61 <Reference Include="System" >
69 <HintPath>System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System.Data"> 65 <Reference Include="System.Data" >
73 <HintPath>System.Data.dll</HintPath> 66 <HintPath>System.Data.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Xml"> 69 <Reference Include="System.Xml" >
77 <HintPath>System.Xml.dll</HintPath> 70 <HintPath>System.Xml.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="OpenSim.Framework.dll"> 73 <Reference Include="OpenSim.Framework.dll" >
81 <HintPath>..\bin\OpenSim.Framework.dll</HintPath> 74 <HintPath>..\bin\OpenSim.Framework.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
84 <Reference Include="OpenSim.Framework.Console.dll"> 77 <Reference Include="OpenSim.Framework.Console.dll" >
85 <HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath> 78 <HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath>
86 <Private>False</Private> 79 <Private>False</Private>
87 </Reference> 80 </Reference>
88 <Reference Include="libsecondlife.dll"> 81 <Reference Include="libsecondlife.dll" >
89 <HintPath>..\bin\libsecondlife.dll</HintPath> 82 <HintPath>..\bin\libsecondlife.dll</HintPath>
90 <Private>False</Private> 83 <Private>False</Private>
91 </Reference> 84 </Reference>
@@ -93,6 +86,9 @@
93 <ItemGroup> 86 <ItemGroup>
94 </ItemGroup> 87 </ItemGroup>
95 <ItemGroup> 88 <ItemGroup>
89 <Compile Include="ConsoleCmds.cs">
90 <SubType>Code</SubType>
91 </Compile>
96 <Compile Include="Main.cs"> 92 <Compile Include="Main.cs">
97 <SubType>Code</SubType> 93 <SubType>Code</SubType>
98 </Compile> 94 </Compile>
@@ -110,4 +106,4 @@
110 <PostBuildEvent> 106 <PostBuildEvent>
111 </PostBuildEvent> 107 </PostBuildEvent>
112 </PropertyGroup> 108 </PropertyGroup>
113</Project> \ No newline at end of file 109</Project>
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 1cb35dd..f1c6180 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -11,6 +11,7 @@
11 <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > 11 <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="ConsoleCmds.cs" />
14 <include name="Main.cs" /> 15 <include name="Main.cs" />
15 <include name="UserHttp.cs" /> 16 <include name="UserHttp.cs" />
16 <include name="Properties/AssemblyInfo.cs" /> 17 <include name="Properties/AssemblyInfo.cs" />
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
index 80796ea..b452cf8 100644
--- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
+++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{C83C9D5B-655E-447D-90CA-7C4AB2F814DD}</ProjectGuid> 6 <ProjectGuid>{4CC1DAD6-47F0-4585-86D5-309646942564}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -82,13 +82,13 @@
82 <ItemGroup> 82 <ItemGroup>
83 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 83 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
84 <Name>OpenSim.Framework</Name> 84 <Name>OpenSim.Framework</Name>
85 <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project> 85 <Project>{76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 87 <Private>False</Private>
88 </ProjectReference> 88 </ProjectReference>
89 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 89 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
90 <Name>OpenSim.Framework.Console</Name> 90 <Name>OpenSim.Framework.Console</Name>
91 <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project> 91 <Project>{4CE50A49-7B16-49ED-961B-EC91219E6F73}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 93 <Private>False</Private>
94 </ProjectReference> 94 </ProjectReference>
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
index bd10ce2..ab41686 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</ProjectGuid> 6 <ProjectGuid>{4CE50A49-7B16-49ED-961B-EC91219E6F73}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index b81afb5..7c119f2 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</ProjectGuid> 6 <ProjectGuid>{76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
index e504a0a..413b9f5 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
+++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{21403281-9649-4CE8-869C-E4F2075DEE94}</ProjectGuid> 6 <ProjectGuid>{E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -78,13 +78,13 @@
78 <ItemGroup> 78 <ItemGroup>
79 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 79 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
80 <Name>OpenSim.Framework</Name> 80 <Name>OpenSim.Framework</Name>
81 <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project> 81 <Project>{76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private> 83 <Private>False</Private>
84 </ProjectReference> 84 </ProjectReference>
85 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 85 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
86 <Name>OpenSim.Framework.Console</Name> 86 <Name>OpenSim.Framework.Console</Name>
87 <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project> 87 <Project>{4CE50A49-7B16-49ED-961B-EC91219E6F73}</Project>
88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private> 89 <Private>False</Private>
90 </ProjectReference> 90 </ProjectReference>
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
index fe32cd6..c424896 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
+++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{BFCBC85D-2071-4294-923C-EC62D841A219}</ProjectGuid> 6 <ProjectGuid>{7C2C664B-63CD-4557-B833-1568DFB66E24}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -74,13 +74,13 @@
74 <ItemGroup> 74 <ItemGroup>
75 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 75 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
76 <Name>OpenSim.Framework</Name> 76 <Name>OpenSim.Framework</Name>
77 <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project> 77 <Project>{76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private> 79 <Private>False</Private>
80 </ProjectReference> 80 </ProjectReference>
81 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 81 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
82 <Name>OpenSim.Framework.Console</Name> 82 <Name>OpenSim.Framework.Console</Name>
83 <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project> 83 <Project>{4CE50A49-7B16-49ED-961B-EC91219E6F73}</Project>
84 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 84 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
85 <Private>False</Private> 85 <Private>False</Private>
86 </ProjectReference> 86 </ProjectReference>
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
index 23985fd..00373ad 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}</ProjectGuid> 6 <ProjectGuid>{0BF6C279-3946-4547-AE93-F032281AD492}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -70,7 +70,7 @@
70 <ItemGroup> 70 <ItemGroup>
71 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> 71 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
72 <Name>OpenSim.Physics.Manager</Name> 72 <Name>OpenSim.Physics.Manager</Name>
73 <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project> 73 <Project>{F9EA091B-3231-4D1B-A068-EF4A5781A0D5}</Project>
74 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 74 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
75 <Private>False</Private> 75 <Private>False</Private>
76 </ProjectReference> 76 </ProjectReference>
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
index 0055c9c..1723397 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</ProjectGuid> 6 <ProjectGuid>{F9EA091B-3231-4D1B-A068-EF4A5781A0D5}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -74,7 +74,7 @@
74 <ItemGroup> 74 <ItemGroup>
75 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 75 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
76 <Name>OpenSim.Framework.Console</Name> 76 <Name>OpenSim.Framework.Console</Name>
77 <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project> 77 <Project>{4CE50A49-7B16-49ED-961B-EC91219E6F73}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private> 79 <Private>False</Private>
80 </ProjectReference> 80 </ProjectReference>
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
index 7e83efd..c94ea37 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{C81B7E61-943D-4190-87C3-CB02BF67A2B3}</ProjectGuid> 6 <ProjectGuid>{B96EF3C6-4512-4D35-8FF7-91B2C9294F46}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -74,7 +74,7 @@
74 <ItemGroup> 74 <ItemGroup>
75 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> 75 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
76 <Name>OpenSim.Physics.Manager</Name> 76 <Name>OpenSim.Physics.Manager</Name>
77 <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project> 77 <Project>{F9EA091B-3231-4D1B-A068-EF4A5781A0D5}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private> 79 <Private>False</Private>
80 </ProjectReference> 80 </ProjectReference>
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
index d2039a1..cddf5d8 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{E1510E0F-EFCB-4702-BCB6-96A084454B55}</ProjectGuid> 6 <ProjectGuid>{6102061F-756B-4864-A771-9DAA7CC05826}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -74,7 +74,7 @@
74 <ItemGroup> 74 <ItemGroup>
75 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> 75 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
76 <Name>OpenSim.Physics.Manager</Name> 76 <Name>OpenSim.Physics.Manager</Name>
77 <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project> 77 <Project>{F9EA091B-3231-4D1B-A068-EF4A5781A0D5}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private> 79 <Private>False</Private>
80 </ProjectReference> 80 </ProjectReference>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index f376e04..48eb408 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -1,13 +1,12 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{4171D545-81F5-4C64-AD29-6D7414C38181}</ProjectGuid> 6 <ProjectGuid>{C0460111-58FB-4143-89F6-FB59D187F7CE}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.RegionServer</AssemblyName> 12 <AssemblyName>OpenSim.RegionServer</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.RegionServer</RootNamespace> 19 <RootNamespace>OpenSim.RegionServer</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,28 +55,26 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="System"> 61 <Reference Include="System" >
69 <HintPath>System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System.Data" /> 65 <Reference Include="System.Xml" >
73 <Reference Include="System.Xml">
74 <HintPath>System.Xml.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
75 <Private>False</Private> 67 <Private>False</Private>
76 </Reference> 68 </Reference>
77 <Reference Include="libsecondlife.dll"> 69 <Reference Include="libsecondlife.dll" >
78 <HintPath>..\bin\libsecondlife.dll</HintPath> 70 <HintPath>..\bin\libsecondlife.dll</HintPath>
79 <Private>False</Private> 71 <Private>False</Private>
80 </Reference> 72 </Reference>
81 <Reference Include="Axiom.MathLib.dll"> 73 <Reference Include="Axiom.MathLib.dll" >
82 <HintPath>..\bin\Axiom.MathLib.dll</HintPath> 74 <HintPath>..\bin\Axiom.MathLib.dll</HintPath>
83 <Private>False</Private> 75 <Private>False</Private>
84 </Reference> 76 </Reference>
85 <Reference Include="Db4objects.Db4o.dll"> 77 <Reference Include="Db4objects.Db4o.dll" >
86 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> 78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
87 <Private>False</Private> 79 <Private>False</Private>
88 </Reference> 80 </Reference>
@@ -90,29 +82,27 @@
90 <ItemGroup> 82 <ItemGroup>
91 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 83 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
92 <Name>OpenSim.Framework.Console</Name> 84 <Name>OpenSim.Framework.Console</Name>
93 <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project> 85 <Project>{4CE50A49-7B16-49ED-961B-EC91219E6F73}</Project>
94 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
95 <Private>False</Private> 87 <Private>False</Private>
96 </ProjectReference> 88 </ProjectReference>
97 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 89 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
98 <Name>OpenSim.Physics.Manager</Name> 90 <Name>OpenSim.Physics.Manager</Name>
99 <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project> 91 <Project>{F9EA091B-3231-4D1B-A068-EF4A5781A0D5}</Project>
100 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
101 <Private>False</Private> 93 <Private>False</Private>
102 </ProjectReference> 94 </ProjectReference>
103 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 95 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
104 <Name>OpenSim.Framework</Name> 96 <Name>OpenSim.Framework</Name>
105 <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project> 97 <Project>{76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
107 <Private>False</Private> 99 <Private>False</Private>
108 </ProjectReference> 100 </ProjectReference>
109 </ItemGroup> 101 </ItemGroup>
110 <ItemGroup> 102 <ItemGroup>
111 <Compile Include="AgentAssetUpload.cs"> 103 <Compile Include="AgentAssetUpload.cs">
112 <SubType>Code</SubType> 104 <SubType>Code</SubType>
113 </Compile> 105 </Compile>
114 <Compile Include="CAPS\AdminWebFront.cs" />
115 <Compile Include="CAPS\IRestHandler.cs" />
116 <Compile Include="ConsoleCmds.cs"> 106 <Compile Include="ConsoleCmds.cs">
117 <SubType>Code</SubType> 107 <SubType>Code</SubType>
118 </Compile> 108 </Compile>
@@ -146,6 +136,12 @@
146 <Compile Include="Assets\InventoryCache.cs"> 136 <Compile Include="Assets\InventoryCache.cs">
147 <SubType>Code</SubType> 137 <SubType>Code</SubType>
148 </Compile> 138 </Compile>
139 <Compile Include="CAPS\AdminWebFront.cs">
140 <SubType>Code</SubType>
141 </Compile>
142 <Compile Include="CAPS\IRestHandler.cs">
143 <SubType>Code</SubType>
144 </Compile>
149 <Compile Include="CAPS\SimHttp.cs"> 145 <Compile Include="CAPS\SimHttp.cs">
150 <SubType>Code</SubType> 146 <SubType>Code</SubType>
151 </Compile> 147 </Compile>
@@ -193,4 +189,4 @@
193 <PostBuildEvent> 189 <PostBuildEvent>
194 </PostBuildEvent> 190 </PostBuildEvent>
195 </PropertyGroup> 191 </PropertyGroup>
196</Project> \ No newline at end of file 192</Project>
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 1f2eb24..0a793e6 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}</ProjectGuid> 6 <ProjectGuid>{3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -78,13 +78,13 @@
78 <ItemGroup> 78 <ItemGroup>
79 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 79 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
80 <Name>OpenSim.Framework</Name> 80 <Name>OpenSim.Framework</Name>
81 <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project> 81 <Project>{76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private> 83 <Private>False</Private>
84 </ProjectReference> 84 </ProjectReference>
85 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 85 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
86 <Name>OpenSim.Framework.Console</Name> 86 <Name>OpenSim.Framework.Console</Name>
87 <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project> 87 <Project>{4CE50A49-7B16-49ED-961B-EC91219E6F73}</Project>
88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private> 89 <Private>False</Private>
90 </ProjectReference> 90 </ProjectReference>
diff --git a/OpenSim.build b/OpenSim.build
index c61b728..b012a1b 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -46,7 +46,7 @@
46 <echo message="Deleting all builds from all configurations" /> 46 <echo message="Deleting all builds from all configurations" />
47 <delete dir="${bin.dir}" failonerror="false" /> 47 <delete dir="${bin.dir}" failonerror="false" />
48 <delete dir="${obj.dir}" failonerror="false" /> 48 <delete dir="${obj.dir}" failonerror="false" />
49 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> 49 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" />
50 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> 50 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
51 <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> 51 <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" />
52 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> 52 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
@@ -56,16 +56,18 @@
56 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> 56 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
57 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> 57 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
58 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> 58 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
59 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
59 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> 60 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
60 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> 61 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
61 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> 62 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
62 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> 63 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
63 </target> 64 </target>
64 65
65 <target name="build" depends="init" description=""> 66 <target name="build" depends="init" description="">
66 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> 67 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
67 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> 68 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
68 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> 69 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
70 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" />
69 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> 71 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
70 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> 72 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
71 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> 73 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
@@ -88,7 +90,7 @@
88 90
89 <target name="doc" depends="build-release"> 91 <target name="doc" depends="build-release">
90 <echo message="Generating all documentation from all builds" /> 92 <echo message="Generating all documentation from all builds" />
91 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> 93 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" />
92 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> 94 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
93 <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> 95 <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" />
94 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> 96 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
@@ -98,10 +100,11 @@
98 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> 100 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
99 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> 101 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
100 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> 102 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
103 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
101 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> 104 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
102 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> 105 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
103 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> 106 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
104 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> 107 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
105 </target> 108 </target>
106 109
107</project> 110</project>
diff --git a/OpenSim.sln b/OpenSim.sln
index 8370bef..99d9812 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,32 +1,34 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{E1510E0F-EFCB-4702-BCB6-96A084454B55}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{EAC45D69-AA44-45FB-B0CE-A95272A9B67B}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{7AED7536-7D6B-4E28-8016-B5A554C663B4}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{4CE50A49-7B16-49ED-961B-EC91219E6F73}"
6EndProject 6EndProject
7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C83C9D5B-655E-447D-90CA-7C4AB2F814DD}" 7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{4CC1DAD6-47F0-4585-86D5-309646942564}"
8EndProject 8EndProject
9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{36895293-A627-42EC-BA77-6AF6F5A4A7DF}" 9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{E198DB67-006C-4E76-8D5B-8DD09E91EE2A}"
10EndProject 10EndProject
11Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{BFCBC85D-2071-4294-923C-EC62D841A219}" 11Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{7C2C664B-63CD-4557-B833-1568DFB66E24}"
12EndProject 12EndProject
13Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}" 13Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}"
14EndProject 14EndProject
15Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}" 15Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}"
16EndProject 16EndProject
17Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{3378EE78-2D72-4C21-8F9D-680B33AAFFEE}" 17Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{50CB0968-2DB8-4293-8AC0-7543C796B88D}"
18EndProject 18EndProject
19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{C81B7E61-943D-4190-87C3-CB02BF67A2B3}" 19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{B96EF3C6-4512-4D35-8FF7-91B2C9294F46}"
20EndProject 20EndProject
21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}" 21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{0BF6C279-3946-4547-AE93-F032281AD492}"
22EndProject 22EndProject
23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{4171D545-81F5-4C64-AD29-6D7414C38181}" 23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{C26F3082-76EB-46B1-8378-467A1589D62C}"
24EndProject 24EndProject
25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}" 25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{C0460111-58FB-4143-89F6-FB59D187F7CE}"
26EndProject 26EndProject
27Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{21403281-9649-4CE8-869C-E4F2075DEE94}" 27Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{F9EA091B-3231-4D1B-A068-EF4A5781A0D5}"
28EndProject 28EndProject
29Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}" 29Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}"
30EndProject
31Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{6102061F-756B-4864-A771-9DAA7CC05826}"
30EndProject 32EndProject
31Global 33Global
32 GlobalSection(SolutionConfigurationPlatforms) = preSolution 34 GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,62 +36,66 @@ Global
34 Release|Any CPU = Release|Any CPU 36 Release|Any CPU = Release|Any CPU
35 EndGlobalSection 37 EndGlobalSection
36 GlobalSection(ProjectConfigurationPlatforms) = postSolution 38 GlobalSection(ProjectConfigurationPlatforms) = postSolution
37 {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 39 {EAC45D69-AA44-45FB-B0CE-A95272A9B67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38 {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Debug|Any CPU.Build.0 = Debug|Any CPU 40 {EAC45D69-AA44-45FB-B0CE-A95272A9B67B}.Debug|Any CPU.Build.0 = Debug|Any CPU
39 {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Release|Any CPU.ActiveCfg = Release|Any CPU 41 {EAC45D69-AA44-45FB-B0CE-A95272A9B67B}.Release|Any CPU.ActiveCfg = Release|Any CPU
40 {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Release|Any CPU.Build.0 = Release|Any CPU 42 {EAC45D69-AA44-45FB-B0CE-A95272A9B67B}.Release|Any CPU.Build.0 = Release|Any CPU
41 {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 43 {4CE50A49-7B16-49ED-961B-EC91219E6F73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42 {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Debug|Any CPU.Build.0 = Debug|Any CPU 44 {4CE50A49-7B16-49ED-961B-EC91219E6F73}.Debug|Any CPU.Build.0 = Debug|Any CPU
43 {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Release|Any CPU.ActiveCfg = Release|Any CPU 45 {4CE50A49-7B16-49ED-961B-EC91219E6F73}.Release|Any CPU.ActiveCfg = Release|Any CPU
44 {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Release|Any CPU.Build.0 = Release|Any CPU 46 {4CE50A49-7B16-49ED-961B-EC91219E6F73}.Release|Any CPU.Build.0 = Release|Any CPU
45 {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 47 {4CC1DAD6-47F0-4585-86D5-309646942564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46 {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Debug|Any CPU.Build.0 = Debug|Any CPU 48 {4CC1DAD6-47F0-4585-86D5-309646942564}.Debug|Any CPU.Build.0 = Debug|Any CPU
47 {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Release|Any CPU.ActiveCfg = Release|Any CPU 49 {4CC1DAD6-47F0-4585-86D5-309646942564}.Release|Any CPU.ActiveCfg = Release|Any CPU
48 {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Release|Any CPU.Build.0 = Release|Any CPU 50 {4CC1DAD6-47F0-4585-86D5-309646942564}.Release|Any CPU.Build.0 = Release|Any CPU
49 {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 51 {E198DB67-006C-4E76-8D5B-8DD09E91EE2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50 {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU 52 {E198DB67-006C-4E76-8D5B-8DD09E91EE2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
51 {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU 53 {E198DB67-006C-4E76-8D5B-8DD09E91EE2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
52 {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Release|Any CPU.Build.0 = Release|Any CPU 54 {E198DB67-006C-4E76-8D5B-8DD09E91EE2A}.Release|Any CPU.Build.0 = Release|Any CPU
53 {BFCBC85D-2071-4294-923C-EC62D841A219}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 55 {7C2C664B-63CD-4557-B833-1568DFB66E24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54 {BFCBC85D-2071-4294-923C-EC62D841A219}.Debug|Any CPU.Build.0 = Debug|Any CPU 56 {7C2C664B-63CD-4557-B833-1568DFB66E24}.Debug|Any CPU.Build.0 = Debug|Any CPU
55 {BFCBC85D-2071-4294-923C-EC62D841A219}.Release|Any CPU.ActiveCfg = Release|Any CPU 57 {7C2C664B-63CD-4557-B833-1568DFB66E24}.Release|Any CPU.ActiveCfg = Release|Any CPU
56 {BFCBC85D-2071-4294-923C-EC62D841A219}.Release|Any CPU.Build.0 = Release|Any CPU 58 {7C2C664B-63CD-4557-B833-1568DFB66E24}.Release|Any CPU.Build.0 = Release|Any CPU
57 {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 59 {3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58 {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU 60 {3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
59 {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU 61 {3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
60 {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Release|Any CPU.Build.0 = Release|Any CPU 62 {3CF5C32F-52A5-41E6-B7FB-25DCE2DCABA4}.Release|Any CPU.Build.0 = Release|Any CPU
61 {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 63 {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62 {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Debug|Any CPU.Build.0 = Debug|Any CPU 64 {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
63 {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Release|Any CPU.ActiveCfg = Release|Any CPU 65 {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
64 {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Release|Any CPU.Build.0 = Release|Any CPU 66 {76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}.Release|Any CPU.Build.0 = Release|Any CPU
65 {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 67 {50CB0968-2DB8-4293-8AC0-7543C796B88D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66 {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU 68 {50CB0968-2DB8-4293-8AC0-7543C796B88D}.Debug|Any CPU.Build.0 = Debug|Any CPU
67 {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU 69 {50CB0968-2DB8-4293-8AC0-7543C796B88D}.Release|Any CPU.ActiveCfg = Release|Any CPU
68 {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Release|Any CPU.Build.0 = Release|Any CPU 70 {50CB0968-2DB8-4293-8AC0-7543C796B88D}.Release|Any CPU.Build.0 = Release|Any CPU
69 {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 71 {B96EF3C6-4512-4D35-8FF7-91B2C9294F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70 {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Debug|Any CPU.Build.0 = Debug|Any CPU 72 {B96EF3C6-4512-4D35-8FF7-91B2C9294F46}.Debug|Any CPU.Build.0 = Debug|Any CPU
71 {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Release|Any CPU.ActiveCfg = Release|Any CPU 73 {B96EF3C6-4512-4D35-8FF7-91B2C9294F46}.Release|Any CPU.ActiveCfg = Release|Any CPU
72 {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Release|Any CPU.Build.0 = Release|Any CPU 74 {B96EF3C6-4512-4D35-8FF7-91B2C9294F46}.Release|Any CPU.Build.0 = Release|Any CPU
73 {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 75 {0BF6C279-3946-4547-AE93-F032281AD492}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74 {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Debug|Any CPU.Build.0 = Debug|Any CPU 76 {0BF6C279-3946-4547-AE93-F032281AD492}.Debug|Any CPU.Build.0 = Debug|Any CPU
75 {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Release|Any CPU.ActiveCfg = Release|Any CPU 77 {0BF6C279-3946-4547-AE93-F032281AD492}.Release|Any CPU.ActiveCfg = Release|Any CPU
76 {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Release|Any CPU.Build.0 = Release|Any CPU 78 {0BF6C279-3946-4547-AE93-F032281AD492}.Release|Any CPU.Build.0 = Release|Any CPU
77 {4171D545-81F5-4C64-AD29-6D7414C38181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 79 {C26F3082-76EB-46B1-8378-467A1589D62C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78 {4171D545-81F5-4C64-AD29-6D7414C38181}.Debug|Any CPU.Build.0 = Debug|Any CPU 80 {C26F3082-76EB-46B1-8378-467A1589D62C}.Debug|Any CPU.Build.0 = Debug|Any CPU
79 {4171D545-81F5-4C64-AD29-6D7414C38181}.Release|Any CPU.ActiveCfg = Release|Any CPU 81 {C26F3082-76EB-46B1-8378-467A1589D62C}.Release|Any CPU.ActiveCfg = Release|Any CPU
80 {4171D545-81F5-4C64-AD29-6D7414C38181}.Release|Any CPU.Build.0 = Release|Any CPU 82 {C26F3082-76EB-46B1-8378-467A1589D62C}.Release|Any CPU.Build.0 = Release|Any CPU
81 {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 83 {C0460111-58FB-4143-89F6-FB59D187F7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
82 {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Debug|Any CPU.Build.0 = Debug|Any CPU 84 {C0460111-58FB-4143-89F6-FB59D187F7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
83 {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Release|Any CPU.ActiveCfg = Release|Any CPU 85 {C0460111-58FB-4143-89F6-FB59D187F7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
84 {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Release|Any CPU.Build.0 = Release|Any CPU 86 {C0460111-58FB-4143-89F6-FB59D187F7CE}.Release|Any CPU.Build.0 = Release|Any CPU
85 {21403281-9649-4CE8-869C-E4F2075DEE94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 87 {F9EA091B-3231-4D1B-A068-EF4A5781A0D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
86 {21403281-9649-4CE8-869C-E4F2075DEE94}.Debug|Any CPU.Build.0 = Debug|Any CPU 88 {F9EA091B-3231-4D1B-A068-EF4A5781A0D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
87 {21403281-9649-4CE8-869C-E4F2075DEE94}.Release|Any CPU.ActiveCfg = Release|Any CPU 89 {F9EA091B-3231-4D1B-A068-EF4A5781A0D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
88 {21403281-9649-4CE8-869C-E4F2075DEE94}.Release|Any CPU.Build.0 = Release|Any CPU 90 {F9EA091B-3231-4D1B-A068-EF4A5781A0D5}.Release|Any CPU.Build.0 = Release|Any CPU
89 {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 91 {E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90 {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU 92 {E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}.Debug|Any CPU.Build.0 = Debug|Any CPU
91 {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU 93 {E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}.Release|Any CPU.ActiveCfg = Release|Any CPU
92 {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Release|Any CPU.Build.0 = Release|Any CPU 94 {E2BCA44C-1C7E-4E25-9718-5DAE6A9D528A}.Release|Any CPU.Build.0 = Release|Any CPU
95 {6102061F-756B-4864-A771-9DAA7CC05826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
96 {6102061F-756B-4864-A771-9DAA7CC05826}.Debug|Any CPU.Build.0 = Debug|Any CPU
97 {6102061F-756B-4864-A771-9DAA7CC05826}.Release|Any CPU.ActiveCfg = Release|Any CPU
98 {6102061F-756B-4864-A771-9DAA7CC05826}.Release|Any CPU.Build.0 = Release|Any CPU
93 EndGlobalSection 99 EndGlobalSection
94 GlobalSection(SolutionProperties) = preSolution 100 GlobalSection(SolutionProperties) = preSolution
95 HideSolutionNode = FALSE 101 HideSolutionNode = FALSE
diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj
index bf57515..df3ec24 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}</ProjectGuid> 6 <ProjectGuid>{C26F3082-76EB-46B1-8378-467A1589D62C}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -82,25 +82,25 @@
82 <ItemGroup> 82 <ItemGroup>
83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
84 <Name>OpenSim.Framework</Name> 84 <Name>OpenSim.Framework</Name>
85 <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project> 85 <Project>{76CC2D76-1C90-46BF-A386-B4EEFDDEFCCF}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 87 <Private>False</Private>
88 </ProjectReference> 88 </ProjectReference>
89 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 89 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
90 <Name>OpenSim.Framework.Console</Name> 90 <Name>OpenSim.Framework.Console</Name>
91 <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project> 91 <Project>{4CE50A49-7B16-49ED-961B-EC91219E6F73}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 93 <Private>False</Private>
94 </ProjectReference> 94 </ProjectReference>
95 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 95 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
96 <Name>OpenSim.Physics.Manager</Name> 96 <Name>OpenSim.Physics.Manager</Name>
97 <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project> 97 <Project>{F9EA091B-3231-4D1B-A068-EF4A5781A0D5}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private> 99 <Private>False</Private>
100 </ProjectReference> 100 </ProjectReference>
101 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> 101 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
102 <Name>OpenSim.RegionServer</Name> 102 <Name>OpenSim.RegionServer</Name>
103 <Project>{4171D545-81F5-4C64-AD29-6D7414C38181}</Project> 103 <Project>{C0460111-58FB-4143-89F6-FB59D187F7CE}</Project>
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private> 105 <Private>False</Private>
106 </ProjectReference> 106 </ProjectReference>
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 5505224..6896d2b 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -1,6 +1,6 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}"
4EndProject 4EndProject
5Global 5Global
6 GlobalSection(SolutionConfigurationPlatforms) = preSolution 6 GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -8,10 +8,10 @@ Global
8 Release|Any CPU = Release|Any CPU 8 Release|Any CPU = Release|Any CPU
9 EndGlobalSection 9 EndGlobalSection
10 GlobalSection(ProjectConfigurationPlatforms) = postSolution 10 GlobalSection(ProjectConfigurationPlatforms) = postSolution
11 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 11 {F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
12 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.Build.0 = Debug|Any CPU 12 {F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}.Debug|Any CPU.Build.0 = Debug|Any CPU
13 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.ActiveCfg = Release|Any CPU 13 {F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}.Release|Any CPU.ActiveCfg = Release|Any CPU
14 {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.Build.0 = Release|Any CPU 14 {F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}.Release|Any CPU.Build.0 = Release|Any CPU
15 EndGlobalSection 15 EndGlobalSection
16 GlobalSection(SolutionProperties) = preSolution 16 GlobalSection(SolutionProperties) = preSolution
17 HideSolutionNode = FALSE 17 HideSolutionNode = FALSE
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index eddfe74..60c81a7 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}</ProjectGuid> 6 <ProjectGuid>{F9A31A1F-E13C-493B-B5E3-1BE5F9518E85}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon>App.ico</ApplicationIcon> 9 <ApplicationIcon>App.ico</ApplicationIcon>
diff --git a/Servers/CapsHttpServer.cs b/Servers/CapsHttpServer.cs
deleted file mode 100644
index 1e62c81..0000000
--- a/Servers/CapsHttpServer.cs
+++ /dev/null
@@ -1,332 +0,0 @@
1/*
2Copyright (c) OpenSimCAPS project, http://osgrid.org/
3
4
5* All rights reserved.
6*
7* Redistribution and use in source and binary forms, with or without
8* modification, are permitted provided that the following conditions are met:
9* * Redistributions of source code must retain the above copyright
10* notice, this list of conditions and the following disclaimer.
11* * Redistributions in binary form must reproduce the above copyright
12* notice, this list of conditions and the following disclaimer in the
13* documentation and/or other materials provided with the distribution.
14* * Neither the name of the <organization> nor the
15* names of its contributors may be used to endorse or promote products
16* derived from this software without specific prior written permission.
17*
18* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
19* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
22* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
25* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28*/
29
30using System;
31using System.Text;
32using Nwc.XmlRpc;
33using System.Threading;
34using System.Text.RegularExpressions;
35using System.Net;
36using System.IO;
37using System.Collections;
38using System.Collections.Generic;
39using libsecondlife;
40using OpenSim.Framework.Console;
41using OpenSim.Framework.Interfaces;
42
43namespace OpenSim.Servers
44{
45 // Dummy HTTP server, does nothing useful for now
46
47 public class CapsHttpServer
48 {
49 public Thread HTTPD;
50 public HttpListener Listener;
51 private string AdminPage;
52 private string NewAccountForm;
53 private string LoginForm;
54 private string passWord = "Admin";
55
56 public CapsHttpServer()
57 {
58 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting up HTTP Server");
59 HTTPD = new Thread(new ThreadStart(StartHTTP));
60 HTTPD.Start();
61 LoadAdminPage();
62 }
63
64 public void StartHTTP()
65 {
66 try
67 {
68 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimHttp.cs:StartHTTP() - Spawned main thread OK");
69 Listener = new HttpListener();
70
71 Listener.Prefixes.Add("http://+:" + OpenSimRoot.Instance.Cfg.IPListenPort + "/");
72 Listener.Start();
73
74 HttpListenerContext context;
75 while (true)
76 {
77 context = Listener.GetContext();
78 ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
79 }
80 }
81 catch (Exception e)
82 {
83 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message);
84 }
85 }
86
87 private string ParseXMLRPC(string requestBody)
88 {
89 try
90 {
91 XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
92
93 Hashtable requestData = (Hashtable)request.Params[0];
94 switch (request.MethodName)
95 {
96 case "expect_user":
97 AgentCircuitData agent_data = new AgentCircuitData();
98 agent_data.SessionID = new LLUUID((string)requestData["session_id"]);
99 agent_data.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
100 agent_data.firstname = (string)requestData["firstname"];
101 agent_data.lastname = (string)requestData["lastname"];
102 agent_data.AgentID = new LLUUID((string)requestData["agent_id"]);
103 agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
104 if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Remote")
105 {
106 ((RemoteGridBase)OpenSimRoot.Instance.GridServers.GridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data);
107 }
108 return "<?xml version=\"1.0\"?><methodResponse><params /></methodResponse>";
109 break;
110 }
111 }
112 catch (Exception e)
113 {
114 Console.WriteLine(e.ToString());
115 }
116 return "";
117 }
118
119 private string ParseREST(string requestBody, string requestURL, string requestMethod)
120 {
121 string responseString = "";
122 try
123 {
124 switch (requestURL)
125 {
126 case "/Admin/Accounts":
127 if (requestMethod == "GET")
128 {
129 responseString = "<p> Account management </p>";
130 responseString += "<br> ";
131 responseString += "<p> Create New Account </p>";
132 responseString += NewAccountForm;
133 }
134 break;
135 case "/Admin/Clients":
136 if (requestMethod == "GET")
137 {
138 responseString = " <p> Listing connected Clients </p>";
139 OpenSim.world.Avatar TempAv;
140 foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys)
141 {
142 if (OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
143 {
144 TempAv = (OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID];
145 responseString += "<p>";
146 responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString());
147 responseString += "</p>";
148 }
149 }
150 }
151 break;
152 case "/Admin/NewAccount":
153 if (requestMethod == "POST")
154 {
155 string[] comp = new string[10];
156 string[] passw = new string[3];
157 string delimStr = "&";
158 char[] delimiter = delimStr.ToCharArray();
159 string delimStr2 = "=";
160 char[] delimiter2 = delimStr2.ToCharArray();
161
162 //Console.WriteLine(requestBody);
163 comp = requestBody.Split(delimiter);
164 passw = comp[3].Split(delimiter2);
165 if (passw[1] == passWord)
166 {
167 responseString = "<p> New Account created </p>";
168 }
169 else
170 {
171 responseString = "<p> Admin password is incorrect, please login with the correct password</p>";
172 responseString += "<br><br>" + LoginForm;
173 }
174 }
175 break;
176 case "/Admin/Login":
177 if (requestMethod == "POST")
178 {
179 // Console.WriteLine(requestBody);
180 if (requestBody == passWord)
181 {
182 responseString = "<p> Login Successful </p>";
183 }
184 else
185 {
186 responseString = "<p> Password Error </p>";
187 responseString += "<p> Please Login with the correct password </p>";
188 responseString += "<br><br> " + LoginForm;
189 }
190 }
191 break;
192 case "/Admin/Welcome":
193 if (requestMethod == "GET")
194 {
195 responseString = "Welcome to the OpenSim Admin Page";
196 responseString += "<br><br><br> " + LoginForm;
197
198 }
199 break;
200 }
201 }
202 catch (Exception e)
203 {
204 Console.WriteLine(e.ToString());
205 }
206
207 return responseString;
208 }
209
210 private string ParseLLSDXML(string requestBody)
211 {
212 // dummy function for now - IMPLEMENT ME!
213 return "";
214 }
215
216 public void HandleRequest(Object stateinfo)
217 {
218 // Console.WriteLine("new http incoming");
219 HttpListenerContext context = (HttpListenerContext)stateinfo;
220
221 HttpListenerRequest request = context.Request;
222 HttpListenerResponse response = context.Response;
223
224 response.KeepAlive = false;
225 response.SendChunked = false;
226
227 System.IO.Stream body = request.InputStream;
228 System.Text.Encoding encoding = System.Text.Encoding.UTF8;
229 System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
230
231 string requestBody = reader.ReadToEnd();
232 body.Close();
233 reader.Close();
234
235 //Console.WriteLine(request.HttpMethod + " " + request.RawUrl + " Http/" + request.ProtocolVersion.ToString() + " content type: " + request.ContentType);
236 //Console.WriteLine(requestBody);
237
238 string responseString = "";
239 switch (request.ContentType)
240 {
241 case "text/xml":
242 // must be XML-RPC, so pass to the XML-RPC parser
243
244 responseString = ParseXMLRPC(requestBody);
245 response.AddHeader("Content-type", "text/xml");
246 break;
247
248 case "application/xml":
249 // probably LLSD we hope, otherwise it should be ignored by the parser
250 responseString = ParseLLSDXML(requestBody);
251 response.AddHeader("Content-type", "application/xml");
252 break;
253
254 case "application/x-www-form-urlencoded":
255 // a form data POST so send to the REST parser
256 responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
257 response.AddHeader("Content-type", "text/html");
258 break;
259
260 case null:
261 if ((request.HttpMethod == "GET") && (request.RawUrl == "/Admin"))
262 {
263 responseString = AdminPage;
264 response.AddHeader("Content-type", "text/html");
265 }
266 else
267 {
268 // must be REST or invalid crap, so pass to the REST parser
269 responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
270 response.AddHeader("Content-type", "text/html");
271 }
272 break;
273
274 }
275
276 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
277 System.IO.Stream output = response.OutputStream;
278 response.SendChunked = false;
279 response.ContentLength64 = buffer.Length;
280 output.Write(buffer, 0, buffer.Length);
281 output.Close();
282 }
283
284 private void LoadAdminPage()
285 {
286 try
287 {
288 StreamReader SR;
289 string lines;
290 AdminPage = "";
291 NewAccountForm = "";
292 LoginForm = "";
293 SR = File.OpenText("testadmin.htm");
294
295 while (!SR.EndOfStream)
296 {
297 lines = SR.ReadLine();
298 AdminPage += lines + "\n";
299
300 }
301 SR.Close();
302
303 SR = File.OpenText("newaccountform.htm");
304
305 while (!SR.EndOfStream)
306 {
307 lines = SR.ReadLine();
308 NewAccountForm += lines + "\n";
309
310 }
311 SR.Close();
312
313 SR = File.OpenText("login.htm");
314
315 while (!SR.EndOfStream)
316 {
317 lines = SR.ReadLine();
318 LoginForm += lines + "\n";
319
320 }
321 SR.Close();
322 }
323 catch (Exception e)
324 {
325 Console.WriteLine(e.ToString());
326 }
327
328 }
329 }
330
331
332}
diff --git a/Servers/OpenSim.Servers.csproj b/Servers/OpenSim.Servers.csproj
index 9c66943..bc386fd 100644
--- a/Servers/OpenSim.Servers.csproj
+++ b/Servers/OpenSim.Servers.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{A8E12EC9-CB2F-4D25-AFD0-626BF2162F5D}</ProjectGuid> 6 <ProjectGuid>{EAC45D69-AA44-45FB-B0CE-A95272A9B67B}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -82,9 +82,6 @@
82 <ItemGroup> 82 <ItemGroup>
83 </ItemGroup> 83 </ItemGroup>
84 <ItemGroup> 84 <ItemGroup>
85 <Compile Include="CapsHttpServer.cs">
86 <SubType>Code</SubType>
87 </Compile>
88 </ItemGroup> 85 </ItemGroup>
89 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 86 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
90 <PropertyGroup> 87 <PropertyGroup>
diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build
index 1321629..1d6b315 100644
--- a/Servers/OpenSim.Servers.dll.build
+++ b/Servers/OpenSim.Servers.dll.build
@@ -11,7 +11,6 @@
11 <resources prefix="OpenSim.Servers" dynamicprefix="true" > 11 <resources prefix="OpenSim.Servers" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="CapsHttpServer.cs" />
15 </sources> 14 </sources>
16 <references basedir="${project::get-base-directory()}"> 15 <references basedir="${project::get-base-directory()}">
17 <lib> 16 <lib>
diff --git a/prebuild.xml b/prebuild.xml
index ee8a2ac..d1030af 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -95,7 +95,7 @@
95 </Files> 95 </Files>
96 </Project> 96 </Project>
97 97
98 <!-- Project name="OpenSim.Servers" path="Servers" type="Library"> 98 <Project name="OpenSim.Servers" path="Servers" type="Library">
99 <Configuration name="Debug"> 99 <Configuration name="Debug">
100 <Options> 100 <Options>
101 <OutputPath>../bin/</OutputPath> 101 <OutputPath>../bin/</OutputPath>
@@ -117,7 +117,7 @@
117 <Files> 117 <Files>
118 <Match pattern="*.cs" recurse="true"/> 118 <Match pattern="*.cs" recurse="true"/>
119 </Files> 119 </Files>
120 </Project --> 120 </Project>
121 121
122 <!-- OGS projects --> 122 <!-- OGS projects -->
123 123
generated by cgit v1.1 at 2024-11-09 19:53:33 +0000