aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-06-19 10:40:20 +0000
committerMW2007-06-19 10:40:20 +0000
commit320fbcb7b4179968994100d0819da2e0732451ef (patch)
tree7babe0b5a0b7d3c4a46cd3f7a6198565d5e31e76
parent* Cleaning up unused zircon branch. (diff)
downloadopensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.zip
opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.tar.gz
opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.tar.bz2
opensim-SC_OLD-320fbcb7b4179968994100d0819da2e0732451ef.tar.xz
Made a base class from the Grid mode UserServer.UserManager and included that in the OpenSim solution.
Included OpenGrid.Framework.Data in the OpenSim solution (and OpenGrid.Framework.Data.DB4O). Changed OpenSim.LocalCommunications.LocalUserServices so that it inherits from the UserManagement Base class. (still not finished implementing the CustomiseResponse() method)
Diffstat (limited to '')
-rw-r--r--Common/OpenGrid.Framework.Communications/IUserServices.cs8
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj40
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build1
-rw-r--r--Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs (renamed from OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs (renamed from OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs (renamed from OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj (renamed from OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj)0
-rw-r--r--Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine (renamed from OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine)0
-rw-r--r--Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858 (renamed from OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858)0
-rw-r--r--Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921 (renamed from OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921)0
-rw-r--r--Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user12
-rw-r--r--Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build (renamed from OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build)0
-rw-r--r--Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs (renamed from OpenGridServices/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data/GridData.cs (renamed from OpenGridServices/OpenGrid.Framework.Data/GridData.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data/ILogData.cs (renamed from OpenGridServices/OpenGrid.Framework.Data/ILogData.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data/IniConfig.cs (renamed from OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data/InventoryData.cs (renamed from OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj (renamed from OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj)0
-rw-r--r--Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine (renamed from OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine)0
-rw-r--r--Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858 (renamed from OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858)0
-rw-r--r--Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921 (renamed from OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921)0
-rw-r--r--Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user12
-rw-r--r--Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build (renamed from OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build)0
-rw-r--r--Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs (renamed from OpenGridServices/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data/SimProfileData.cs (renamed from OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data/UserData.cs (renamed from OpenGridServices/OpenGrid.Framework.Data/UserData.cs)0
-rw-r--r--Common/OpenGrid.Framework.Data/UserProfileData.cs (renamed from OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs)0
-rw-r--r--Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj122
-rw-r--r--Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user12
-rw-r--r--Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build49
-rw-r--r--Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj122
-rw-r--r--Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user12
-rw-r--r--Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build49
-rw-r--r--Common/OpenGrid.Framework.UserManager/UserManagerBase.cs721
-rw-r--r--Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj2
-rw-r--r--OpenGridServices.build15
-rw-r--r--OpenGridServices.sln127
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj2
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj2
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj2
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj2
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj6
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build1
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/UserManager.cs668
-rw-r--r--OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj2
-rw-r--r--OpenSim.build19
-rw-r--r--OpenSim.sln285
-rw-r--r--OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs10
-rw-r--r--OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs36
-rw-r--r--OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs42
-rw-r--r--OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs43
-rw-r--r--OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj54
-rw-r--r--OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user2
-rw-r--r--OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build3
-rw-r--r--OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj2
-rw-r--r--OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj2
-rw-r--r--OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj2
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.csproj2
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj2
-rw-r--r--OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj2
-rw-r--r--OpenSim/OpenSim/OpenSim.csproj2
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs2
-rw-r--r--Prebuild/Prebuild.build7
-rw-r--r--Prebuild/Prebuild.sln3
-rw-r--r--Prebuild/src/Prebuild.csproj18
-rw-r--r--prebuild.xml503
66 files changed, 1841 insertions, 1189 deletions
diff --git a/Common/OpenGrid.Framework.Communications/IUserServices.cs b/Common/OpenGrid.Framework.Communications/IUserServices.cs
index 798200a..4cb66e7 100644
--- a/Common/OpenGrid.Framework.Communications/IUserServices.cs
+++ b/Common/OpenGrid.Framework.Communications/IUserServices.cs
@@ -30,15 +30,15 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using libsecondlife;
32 32
33using OpenSim.Framework.User; 33using OpenGrid.Framework.Data;
34 34
35namespace OpenGrid.Framework.Communications 35namespace OpenGrid.Framework.Communications
36{ 36{
37 public interface IUserServices 37 public interface IUserServices
38 { 38 {
39 UserProfile GetUserProfile(string first_name, string last_name); 39 UserProfileData GetUserProfile(string first_name, string last_name);
40 UserProfile GetUserProfile(string name); 40 UserProfileData GetUserProfile(string name);
41 UserProfile GetUserProfile(LLUUID avatar_id); 41 UserProfileData GetUserProfile(LLUUID avatar_id);
42 42
43 } 43 }
44} 44}
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 537151d..9a9568c 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -1,4 +1,4 @@
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>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{683344D5-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{683344D5-0000-0000-0000-000000000000}</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>OpenGrid.Framework.Communications</AssemblyName> 12 <AssemblyName>OpenGrid.Framework.Communications</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>OpenGrid.Framework.Communications</RootNamespace> 19 <RootNamespace>OpenGrid.Framework.Communications</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,30 +55,34 @@
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="libsecondlife.dll"> 61 <Reference Include="libsecondlife.dll" >
69 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System"> 65 <Reference Include="System" >
73 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Data" /> 69 <Reference Include="System.Xml" >
77 <Reference Include="System.Xml">
78 <HintPath>System.Xml.dll</HintPath> 70 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private> 71 <Private>False</Private>
80 </Reference> 72 </Reference>
81 </ItemGroup> 73 </ItemGroup>
82 <ItemGroup> 74 <ItemGroup>
75 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
76 <Name>OpenGrid.Framework.Data</Name>
77 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private>
80 </ProjectReference>
83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 81 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
84 <Name>OpenSim.Framework</Name> 82 <Name>OpenSim.Framework</Name>
85 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 83 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 84 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 85 <Private>False</Private>
88 </ProjectReference> 86 </ProjectReference>
89 </ItemGroup> 87 </ItemGroup>
90 <ItemGroup> 88 <ItemGroup>
@@ -111,4 +109,4 @@
111 <PostBuildEvent> 109 <PostBuildEvent>
112 </PostBuildEvent> 110 </PostBuildEvent>
113 </PropertyGroup> 111 </PropertyGroup>
114</Project> \ No newline at end of file 112</Project>
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
index fbb627c..392220b 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
@@ -23,6 +23,7 @@
23 <include name="${project::get-base-directory()}/${build.dir}" /> 23 <include name="${project::get-base-directory()}/${build.dir}" />
24 </lib> 24 </lib>
25 <include name="../../bin/libsecondlife.dll" /> 25 <include name="../../bin/libsecondlife.dll" />
26 <include name="../../bin/OpenGrid.Framework.Data.dll" />
26 <include name="../../bin/OpenSim.Framework.dll" /> 27 <include name="../../bin/OpenSim.Framework.dll" />
27 <include name="System.dll" /> 28 <include name="System.dll" />
28 <include name="System.Xml.dll" /> 29 <include name="System.Xml.dll" />
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
index 2b23131..2b23131 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/Common/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
index 356a49c..356a49c 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ b/Common/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
index 315f48d..315f48d 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
+++ b/Common/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index d2d6140..d2d6140 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
index 82d4f5f..82d4f5f 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.mine
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858 b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
index d6dd03d..d6dd03d 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r858
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921 b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
index 3b783ca..3b783ca 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.r921
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
new file mode 100644
index 0000000..5941547
--- /dev/null
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
index d82d751..d82d751 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
index dc4a9a1..dc4a9a1 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
+++ b/Common/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/GridData.cs b/Common/OpenGrid.Framework.Data/GridData.cs
index e9fb215..e9fb215 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/GridData.cs
+++ b/Common/OpenGrid.Framework.Data/GridData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/ILogData.cs b/Common/OpenGrid.Framework.Data/ILogData.cs
index 2ac0bfe..2ac0bfe 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/ILogData.cs
+++ b/Common/OpenGrid.Framework.Data/ILogData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs b/Common/OpenGrid.Framework.Data/IniConfig.cs
index d17afac..d17afac 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/IniConfig.cs
+++ b/Common/OpenGrid.Framework.Data/IniConfig.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs b/Common/OpenGrid.Framework.Data/InventoryData.cs
index 12f559b..12f559b 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/InventoryData.cs
+++ b/Common/OpenGrid.Framework.Data/InventoryData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index 0b53b02..0b53b02 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
index a572204..a572204 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.mine
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858 b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
index 3b6d24d..3b6d24d 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r858
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921 b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
index 990cd16..990cd16 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.r921
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
new file mode 100644
index 0000000..5941547
--- /dev/null
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index 7abebeb..7abebeb 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
diff --git a/OpenGridServices/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
index 1446673..1446673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
+++ b/Common/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs b/Common/OpenGrid.Framework.Data/SimProfileData.cs
index a3e7cb7..a3e7cb7 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/SimProfileData.cs
+++ b/Common/OpenGrid.Framework.Data/SimProfileData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/UserData.cs b/Common/OpenGrid.Framework.Data/UserData.cs
index c2d5a72..c2d5a72 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/UserData.cs
+++ b/Common/OpenGrid.Framework.Data/UserData.cs
diff --git a/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs b/Common/OpenGrid.Framework.Data/UserProfileData.cs
index 82633e1..82633e1 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/Common/OpenGrid.Framework.Data/UserProfileData.cs
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj
new file mode 100644
index 0000000..232712b
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj
@@ -0,0 +1,122 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{DA9A7391-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenGrid.Framework.UserManagement</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>OpenGrid.Framework.UserManagement</RootNamespace>
20 <StartupObject></StartupObject>
21 <FileUpgradeFlags>
22 </FileUpgradeFlags>
23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
26 <BaseAddress>285212672</BaseAddress>
27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
28 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize>
35 <OutputPath>..\..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn>
41 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
44 <BaseAddress>285212672</BaseAddress>
45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize>
53 <OutputPath>..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn>
59 </PropertyGroup>
60 <ItemGroup>
61 <Reference Include="Db4objects.Db4o.dll" >
62 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
63 <Private>False</Private>
64 </Reference>
65 <Reference Include="libsecondlife.dll" >
66 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="OpenSim.Framework" >
70 <HintPath>OpenSim.Framework.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 <Reference Include="OpenSim.Framework.Console" >
74 <HintPath>OpenSim.Framework.Console.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="OpenSim.GenericConfig.Xml" >
78 <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
81 <Reference Include="OpenSim.Servers" >
82 <HintPath>OpenSim.Servers.dll</HintPath>
83 <Private>False</Private>
84 </Reference>
85 <Reference Include="System" >
86 <HintPath>System.dll</HintPath>
87 <Private>False</Private>
88 </Reference>
89 <Reference Include="System.Data" >
90 <HintPath>System.Data.dll</HintPath>
91 <Private>False</Private>
92 </Reference>
93 <Reference Include="System.Xml" >
94 <HintPath>System.Xml.dll</HintPath>
95 <Private>False</Private>
96 </Reference>
97 <Reference Include="XMLRPC" >
98 <HintPath>XMLRPC.dll</HintPath>
99 <Private>False</Private>
100 </Reference>
101 </ItemGroup>
102 <ItemGroup>
103 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
104 <Name>OpenGrid.Framework.Data</Name>
105 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
107 <Private>False</Private>
108 </ProjectReference>
109 </ItemGroup>
110 <ItemGroup>
111 <Compile Include="UserManagerBase.cs">
112 <SubType>Code</SubType>
113 </Compile>
114 </ItemGroup>
115 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
116 <PropertyGroup>
117 <PreBuildEvent>
118 </PreBuildEvent>
119 <PostBuildEvent>
120 </PostBuildEvent>
121 </PropertyGroup>
122</Project>
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
new file mode 100644
index 0000000..5941547
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build
new file mode 100644
index 0000000..a2f5d13
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build
@@ -0,0 +1,49 @@
1<?xml version="1.0" ?>
2<project name="OpenGrid.Framework.UserManagement" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenGrid.Framework.UserManagement" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="UserManagerBase.cs" />
15 </sources>
16 <references basedir="${project::get-base-directory()}">
17 <lib>
18 <include name="${project::get-base-directory()}" />
19 <include name="${project::get-base-directory()}/${build.dir}" />
20 </lib>
21 <include name="../../bin/Db4objects.Db4o.dll" />
22 <include name="../../bin/libsecondlife.dll" />
23 <include name="../../bin/OpenGrid.Framework.Data.dll" />
24 <include name="../../bin/OpenSim.Framework.dll" />
25 <include name="../../bin/OpenSim.Framework.Console.dll" />
26 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
27 <include name="../../bin/OpenSim.Servers.dll" />
28 <include name="System.dll" />
29 <include name="System.Data.dll" />
30 <include name="System.Xml.dll" />
31 <include name="../../bin/XMLRPC.dll" />
32 </references>
33 </csc>
34 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
35 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
36 <copy todir="${project::get-base-directory()}/../../bin/">
37 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
38 <include name="*.dll"/>
39 <include name="*.exe"/>
40 </fileset>
41 </copy>
42 </target>
43 <target name="clean">
44 <delete dir="${bin.dir}" failonerror="false" />
45 <delete dir="${obj.dir}" failonerror="false" />
46 </target>
47 <target name="doc" description="Creates documentation.">
48 </target>
49</project>
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj
new file mode 100644
index 0000000..43f56a4
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj
@@ -0,0 +1,122 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{D1D78B8D-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenGrid.Framework.UserManager</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>OpenGrid.Framework.UserManager</RootNamespace>
20 <StartupObject></StartupObject>
21 <FileUpgradeFlags>
22 </FileUpgradeFlags>
23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
26 <BaseAddress>285212672</BaseAddress>
27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
28 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize>
35 <OutputPath>..\..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn>
41 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
44 <BaseAddress>285212672</BaseAddress>
45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize>
53 <OutputPath>..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn>
59 </PropertyGroup>
60 <ItemGroup>
61 <Reference Include="Db4objects.Db4o.dll" >
62 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
63 <Private>False</Private>
64 </Reference>
65 <Reference Include="libsecondlife.dll" >
66 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="OpenSim.Framework" >
70 <HintPath>OpenSim.Framework.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 <Reference Include="OpenSim.Framework.Console" >
74 <HintPath>OpenSim.Framework.Console.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="OpenSim.GenericConfig.Xml" >
78 <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
81 <Reference Include="OpenSim.Servers" >
82 <HintPath>OpenSim.Servers.dll</HintPath>
83 <Private>False</Private>
84 </Reference>
85 <Reference Include="System" >
86 <HintPath>System.dll</HintPath>
87 <Private>False</Private>
88 </Reference>
89 <Reference Include="System.Data" >
90 <HintPath>System.Data.dll</HintPath>
91 <Private>False</Private>
92 </Reference>
93 <Reference Include="System.Xml" >
94 <HintPath>System.Xml.dll</HintPath>
95 <Private>False</Private>
96 </Reference>
97 <Reference Include="XMLRPC" >
98 <HintPath>XMLRPC.dll</HintPath>
99 <Private>False</Private>
100 </Reference>
101 </ItemGroup>
102 <ItemGroup>
103 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
104 <Name>OpenGrid.Framework.Data</Name>
105 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
107 <Private>False</Private>
108 </ProjectReference>
109 </ItemGroup>
110 <ItemGroup>
111 <Compile Include="UserManagerBase.cs">
112 <SubType>Code</SubType>
113 </Compile>
114 </ItemGroup>
115 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
116 <PropertyGroup>
117 <PreBuildEvent>
118 </PreBuildEvent>
119 <PostBuildEvent>
120 </PostBuildEvent>
121 </PropertyGroup>
122</Project>
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user
new file mode 100644
index 0000000..5941547
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build
new file mode 100644
index 0000000..81a87f5
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManager.dll.build
@@ -0,0 +1,49 @@
1<?xml version="1.0" ?>
2<project name="OpenGrid.Framework.UserManager" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenGrid.Framework.UserManager" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="UserManagerBase.cs" />
15 </sources>
16 <references basedir="${project::get-base-directory()}">
17 <lib>
18 <include name="${project::get-base-directory()}" />
19 <include name="${project::get-base-directory()}/${build.dir}" />
20 </lib>
21 <include name="../../bin/Db4objects.Db4o.dll" />
22 <include name="../../bin/libsecondlife.dll" />
23 <include name="../../bin/OpenGrid.Framework.Data.dll" />
24 <include name="../../bin/OpenSim.Framework.dll" />
25 <include name="../../bin/OpenSim.Framework.Console.dll" />
26 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
27 <include name="../../bin/OpenSim.Servers.dll" />
28 <include name="System.dll" />
29 <include name="System.Data.dll" />
30 <include name="System.Xml.dll" />
31 <include name="../../bin/XMLRPC.dll" />
32 </references>
33 </csc>
34 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
35 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
36 <copy todir="${project::get-base-directory()}/../../bin/">
37 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
38 <include name="*.dll"/>
39 <include name="*.exe"/>
40 </fileset>
41 </copy>
42 </target>
43 <target name="clean">
44 <delete dir="${bin.dir}" failonerror="false" />
45 <delete dir="${obj.dir}" failonerror="false" />
46 </target>
47 <target name="doc" description="Creates documentation.">
48 </target>
49</project>
diff --git a/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs b/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
new file mode 100644
index 0000000..d6d50c1
--- /dev/null
+++ b/Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
@@ -0,0 +1,721 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using OpenGrid.Framework.Data;
33using libsecondlife;
34using System.Reflection;
35
36using System.Xml;
37using Nwc.XmlRpc;
38using OpenSim.Framework.Sims;
39using OpenSim.Framework.Inventory;
40using OpenSim.Framework.Utilities;
41
42using System.Security.Cryptography;
43
44namespace OpenGrid.Framework.UserManagement
45{
46 public class UserManagerBase
47 {
48 public OpenSim.Framework.Interfaces.UserConfig _config;
49 Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
50
51 /// <summary>
52 /// Adds a new user server plugin - user servers will be requested in the order they were loaded.
53 /// </summary>
54 /// <param name="FileName">The filename to the user server plugin DLL</param>
55 public void AddPlugin(string FileName)
56 {
57 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
58 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
59
60 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
61 foreach (Type pluginType in pluginAssembly.GetTypes())
62 {
63 if (!pluginType.IsAbstract)
64 {
65 Type typeInterface = pluginType.GetInterface("IUserData", true);
66
67 if (typeInterface != null)
68 {
69 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
70 plug.Initialise();
71 this._plugins.Add(plug.getName(), plug);
72 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface");
73 }
74
75 typeInterface = null;
76 }
77 }
78
79 pluginAssembly = null;
80 }
81
82 /// <summary>
83 ///
84 /// </summary>
85 /// <param name="user"></param>
86 public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
87 {
88 UserProfileData user = new UserProfileData();
89 user.homeLocation = new LLVector3(128, 128, 100);
90 user.UUID = LLUUID.Random();
91 user.username = firstName;
92 user.surname = lastName;
93 user.passwordHash = pass;
94 user.passwordSalt = "";
95 user.created = Util.UnixTimeSinceEpoch();
96 user.homeLookAt = new LLVector3(100, 100, 100);
97 user.homeRegion = Util.UIntsToLong((regX * 256), (regY * 256));
98
99 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
100 {
101 try
102 {
103 plugin.Value.addNewUserProfile(user);
104
105 }
106 catch (Exception e)
107 {
108 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
109 }
110 }
111 }
112
113 /// <summary>
114 /// Loads a user profile from a database by UUID
115 /// </summary>
116 /// <param name="uuid">The target UUID</param>
117 /// <returns>A user profile</returns>
118 public UserProfileData getUserProfile(LLUUID uuid)
119 {
120 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
121 {
122 try
123 {
124 UserProfileData profile = plugin.Value.getUserByUUID(uuid);
125 profile.currentAgent = getUserAgent(profile.UUID);
126 return profile;
127 }
128 catch (Exception e)
129 {
130 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
131 }
132 }
133
134 return null;
135 }
136
137
138 /// <summary>
139 /// Loads a user profile by name
140 /// </summary>
141 /// <param name="name">The target name</param>
142 /// <returns>A user profile</returns>
143 public UserProfileData getUserProfile(string name)
144 {
145 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
146 {
147 try
148 {
149 UserProfileData profile = plugin.Value.getUserByName(name);
150 profile.currentAgent = getUserAgent(profile.UUID);
151 return profile;
152 }
153 catch (Exception e)
154 {
155 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
156 }
157 }
158
159 return null;
160 }
161
162 /// <summary>
163 /// Loads a user profile by name
164 /// </summary>
165 /// <param name="fname">First name</param>
166 /// <param name="lname">Last name</param>
167 /// <returns>A user profile</returns>
168 public UserProfileData getUserProfile(string fname, string lname)
169 {
170 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
171 {
172 try
173 {
174 UserProfileData profile = plugin.Value.getUserByName(fname,lname);
175 try
176 {
177 profile.currentAgent = getUserAgent(profile.UUID);
178 }
179 catch (Exception e)
180 {
181 // Ignore
182 }
183 return profile;
184 }
185 catch (Exception e)
186 {
187 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
188 }
189 }
190
191 return null;
192 }
193
194 /// <summary>
195 /// Loads a user agent by uuid (not called directly)
196 /// </summary>
197 /// <param name="uuid">The agents UUID</param>
198 /// <returns>Agent profiles</returns>
199 public UserAgentData getUserAgent(LLUUID uuid)
200 {
201 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
202 {
203 try
204 {
205 return plugin.Value.getAgentByUUID(uuid);
206 }
207 catch (Exception e)
208 {
209 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
210 }
211 }
212
213 return null;
214 }
215
216 /// <summary>
217 /// Loads a user agent by name (not called directly)
218 /// </summary>
219 /// <param name="name">The agents name</param>
220 /// <returns>A user agent</returns>
221 public UserAgentData getUserAgent(string name)
222 {
223 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
224 {
225 try
226 {
227 return plugin.Value.getAgentByName(name);
228 }
229 catch (Exception e)
230 {
231 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
232 }
233 }
234
235 return null;
236 }
237
238 /// <summary>
239 /// Loads a user agent by name (not called directly)
240 /// </summary>
241 /// <param name="fname">The agents firstname</param>
242 /// <param name="lname">The agents lastname</param>
243 /// <returns>A user agent</returns>
244 public UserAgentData getUserAgent(string fname, string lname)
245 {
246 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
247 {
248 try
249 {
250 return plugin.Value.getAgentByName(fname,lname);
251 }
252 catch (Exception e)
253 {
254 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
255 }
256 }
257
258 return null;
259 }
260
261 /// <summary>
262 /// Creates a error response caused by invalid XML
263 /// </summary>
264 /// <returns>An XMLRPC response</returns>
265 private static XmlRpcResponse CreateErrorConnectingToGridResponse()
266 {
267 XmlRpcResponse response = new XmlRpcResponse();
268 Hashtable ErrorRespData = new Hashtable();
269 ErrorRespData["reason"] = "key";
270 ErrorRespData["message"] = "Error connecting to grid. Could not percieve credentials from login XML.";
271 ErrorRespData["login"] = "false";
272 response.Value = ErrorRespData;
273 return response;
274 }
275
276 /// <summary>
277 /// Creates an error response caused by bad login credentials
278 /// </summary>
279 /// <returns>An XMLRPC response</returns>
280 private static XmlRpcResponse CreateLoginErrorResponse()
281 {
282 XmlRpcResponse response = new XmlRpcResponse();
283 Hashtable ErrorRespData = new Hashtable();
284 ErrorRespData["reason"] = "key";
285 ErrorRespData["message"] = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.";
286 ErrorRespData["login"] = "false";
287 response.Value = ErrorRespData;
288 return response;
289 }
290
291 /// <summary>
292 /// Creates an error response caused by being logged in already
293 /// </summary>
294 /// <returns>An XMLRPC Response</returns>
295 private static XmlRpcResponse CreateAlreadyLoggedInResponse()
296 {
297 XmlRpcResponse response = new XmlRpcResponse();
298 Hashtable PresenceErrorRespData = new Hashtable();
299 PresenceErrorRespData["reason"] = "presence";
300 PresenceErrorRespData["message"] = "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner";
301 PresenceErrorRespData["login"] = "false";
302 response.Value = PresenceErrorRespData;
303 return response;
304 }
305
306 /// <summary>
307 /// Creates an error response caused by target region being down
308 /// </summary>
309 /// <returns>An XMLRPC Response</returns>
310 private static XmlRpcResponse CreateDeadRegionResponse()
311 {
312 XmlRpcResponse response = new XmlRpcResponse();
313 Hashtable PresenceErrorRespData = new Hashtable();
314 PresenceErrorRespData["reason"] = "key";
315 PresenceErrorRespData["message"] = "The region you are attempting to log into is not responding. Please select another region and try again.";
316 PresenceErrorRespData["login"] = "false";
317 response.Value = PresenceErrorRespData;
318 return response;
319 }
320
321 /// <summary>
322 /// Customises the login response and fills in missing values.
323 /// </summary>
324 /// <param name="response">The existing response</param>
325 /// <param name="theUser">The user profile</param>
326 public virtual void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)
327 {
328
329 }
330
331 /// <summary>
332 /// Checks a user against it's password hash
333 /// </summary>
334 /// <param name="profile">The users profile</param>
335 /// <param name="password">The supplied password</param>
336 /// <returns>Authenticated?</returns>
337 public bool AuthenticateUser(ref UserProfileData profile, string password)
338 {
339 OpenSim.Framework.Console.MainConsole.Instance.Verbose(
340 "Authenticating " + profile.username + " " + profile.surname);
341
342 password = password.Remove(0, 3); //remove $1$
343
344 string s = Util.Md5Hash(password + ":" + profile.passwordSalt);
345
346 return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase);
347 }
348
349 /// <summary>
350 /// Creates and initialises a new user agent - make sure to use CommitAgent when done to submit to the DB
351 /// </summary>
352 /// <param name="profile">The users profile</param>
353 /// <param name="request">The users loginrequest</param>
354 public void CreateAgent(ref UserProfileData profile, XmlRpcRequest request)
355 {
356 Hashtable requestData = (Hashtable)request.Params[0];
357
358 UserAgentData agent = new UserAgentData();
359
360 // User connection
361 agent.agentIP = "";
362 agent.agentOnline = true;
363 agent.agentPort = 0;
364
365 // Generate sessions
366 RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
367 byte[] randDataS = new byte[16];
368 byte[] randDataSS = new byte[16];
369 rand.GetBytes(randDataS);
370 rand.GetBytes(randDataSS);
371
372 agent.secureSessionID = new LLUUID(randDataSS, 0);
373 agent.sessionID = new LLUUID(randDataS, 0);
374
375 // Profile UUID
376 agent.UUID = profile.UUID;
377
378 // Current position (from Home)
379 agent.currentHandle = profile.homeRegion;
380 agent.currentPos = profile.homeLocation;
381
382 // If user specified additional start, use that
383 if (requestData.ContainsKey("start"))
384 {
385 string startLoc = ((string)requestData["start"]).Trim();
386 if (!(startLoc == "last" || startLoc == "home"))
387 {
388 // Format: uri:Ahern&162&213&34
389 try
390 {
391 string[] parts = startLoc.Remove(0, 4).Split('&');
392 string region = parts[0];
393
394 ////////////////////////////////////////////////////
395 //SimProfile SimInfo = new SimProfile();
396 //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
397 }
398 catch (Exception e)
399 {
400
401 }
402 }
403 }
404
405 // What time did the user login?
406 agent.loginTime = Util.UnixTimeSinceEpoch();
407 agent.logoutTime = 0;
408
409 // Current location
410 agent.regionID = new LLUUID(); // Fill in later
411 agent.currentRegion = new LLUUID(); // Fill in later
412
413 profile.currentAgent = agent;
414 }
415
416 /// <summary>
417 /// Saves a target agent to the database
418 /// </summary>
419 /// <param name="profile">The users profile</param>
420 /// <returns>Successful?</returns>
421 public bool CommitAgent(ref UserProfileData profile)
422 {
423 // Saves the agent to database
424 return true;
425 }
426
427 /// <summary>
428 /// Main user login function
429 /// </summary>
430 /// <param name="request">The XMLRPC request</param>
431 /// <returns>The response to send</returns>
432 public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
433 {
434 XmlRpcResponse response = new XmlRpcResponse();
435 Hashtable requestData = (Hashtable)request.Params[0];
436
437 bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));
438 bool GoodLogin = false;
439 string firstname = "";
440 string lastname = "";
441 string passwd = "";
442
443 UserProfileData TheUser;
444
445 if (GoodXML)
446 {
447 firstname = (string)requestData["first"];
448 lastname = (string)requestData["last"];
449 passwd = (string)requestData["passwd"];
450
451 TheUser = getUserProfile(firstname, lastname);
452 if (TheUser == null)
453 return CreateLoginErrorResponse();
454
455 GoodLogin = AuthenticateUser(ref TheUser, passwd);
456 }
457 else
458 {
459 return CreateErrorConnectingToGridResponse();
460 }
461
462 if (!GoodLogin)
463 {
464 return CreateLoginErrorResponse();
465 }
466 else
467 {
468 // If we already have a session...
469 if (TheUser.currentAgent != null && TheUser.currentAgent.agentOnline)
470 {
471 // Reject the login
472 return CreateAlreadyLoggedInResponse();
473 }
474 // Otherwise...
475 // Create a new agent session
476 CreateAgent(ref TheUser, request);
477
478 try
479 {
480 Hashtable responseData = new Hashtable();
481
482 LLUUID AgentID = TheUser.UUID;
483
484 // Global Texture Section
485 Hashtable GlobalT = new Hashtable();
486 GlobalT["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271";
487 GlobalT["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
488 GlobalT["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
489 ArrayList GlobalTextures = new ArrayList();
490 GlobalTextures.Add(GlobalT);
491
492 // Login Flags Section
493 Hashtable LoginFlagsHash = new Hashtable();
494 LoginFlagsHash["daylight_savings"] = "N";
495 LoginFlagsHash["stipend_since_login"] = "N";
496 LoginFlagsHash["gendered"] = "Y"; // Needs to be combined with below...
497 LoginFlagsHash["ever_logged_in"] = "Y"; // Should allow male/female av selection
498 ArrayList LoginFlags = new ArrayList();
499 LoginFlags.Add(LoginFlagsHash);
500
501 // UI Customisation Section
502 Hashtable uiconfig = new Hashtable();
503 uiconfig["allow_first_life"] = "Y";
504 ArrayList ui_config = new ArrayList();
505 ui_config.Add(uiconfig);
506
507 // Classified Categories Section
508 Hashtable ClassifiedCategoriesHash = new Hashtable();
509 ClassifiedCategoriesHash["category_name"] = "Generic";
510 ClassifiedCategoriesHash["category_id"] = (Int32)1;
511 ArrayList ClassifiedCategories = new ArrayList();
512 ClassifiedCategories.Add(ClassifiedCategoriesHash);
513
514 // Inventory Library Section
515 ArrayList AgentInventoryArray = new ArrayList();
516 Hashtable TempHash;
517
518 AgentInventory Library = new AgentInventory();
519 Library.CreateRootFolder(AgentID, true);
520
521 foreach (InventoryFolder InvFolder in Library.InventoryFolders.Values)
522 {
523 TempHash = new Hashtable();
524 TempHash["name"] = InvFolder.FolderName;
525 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
526 TempHash["version"] = (Int32)InvFolder.Version;
527 TempHash["type_default"] = (Int32)InvFolder.DefaultType;
528 TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();
529 AgentInventoryArray.Add(TempHash);
530 }
531
532 Hashtable InventoryRootHash = new Hashtable();
533 InventoryRootHash["folder_id"] = Library.InventoryRoot.FolderID.ToStringHyphenated();
534 ArrayList InventoryRoot = new ArrayList();
535 InventoryRoot.Add(InventoryRootHash);
536
537 Hashtable InitialOutfitHash = new Hashtable();
538 InitialOutfitHash["folder_name"] = "Nightclub Female";
539 InitialOutfitHash["gender"] = "female";
540 ArrayList InitialOutfit = new ArrayList();
541 InitialOutfit.Add(InitialOutfitHash);
542
543 // Circuit Code
544 uint circode = (uint)(Util.RandomClass.Next());
545
546 // Generics
547 responseData["last_name"] = TheUser.surname;
548 responseData["ui-config"] = ui_config;
549 responseData["sim_ip"] = "127.0.0.1"; //SimInfo.sim_ip.ToString();
550 responseData["login-flags"] = LoginFlags;
551 responseData["global-textures"] = GlobalTextures;
552 responseData["classified_categories"] = ClassifiedCategories;
553 responseData["event_categories"] = new ArrayList();
554 responseData["inventory-skeleton"] = AgentInventoryArray;
555 responseData["inventory-skel-lib"] = new ArrayList();
556 responseData["inventory-root"] = InventoryRoot;
557 responseData["event_notifications"] = new ArrayList();
558 responseData["gestures"] = new ArrayList();
559 responseData["inventory-lib-owner"] = new ArrayList();
560 responseData["initial-outfit"] = InitialOutfit;
561 responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
562 responseData["start_location"] = "last";
563 responseData["home"] = "!!null temporary value {home}!!"; // Overwritten
564 responseData["message"] = _config.DefaultStartupMsg;
565 responseData["first_name"] = TheUser.username;
566 responseData["circuit_code"] = (Int32)circode;
567 responseData["sim_port"] = 0; //(Int32)SimInfo.sim_port;
568 responseData["secure_session_id"] = TheUser.currentAgent.secureSessionID.ToStringHyphenated();
569 responseData["look_at"] = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";
570 responseData["agent_id"] = AgentID.ToStringHyphenated();
571 responseData["region_y"] = (Int32)0; // Overwritten
572 responseData["region_x"] = (Int32)0; // Overwritten
573 responseData["seed_capability"] = "";
574 responseData["agent_access"] = "M";
575 responseData["session_id"] = TheUser.currentAgent.sessionID.ToStringHyphenated();
576 responseData["login"] = "true";
577
578 try
579 {
580 this.CustomiseResponse(ref responseData, ref TheUser);
581 }
582 catch (Exception e)
583 {
584 Console.WriteLine(e.ToString());
585 return CreateDeadRegionResponse();
586 }
587
588 CommitAgent(ref TheUser);
589
590 response.Value = responseData;
591 // TheUser.SendDataToSim(SimInfo);
592 return response;
593
594 }
595 catch (Exception E)
596 {
597 Console.WriteLine(E.ToString());
598 }
599 //}
600 }
601 return response;
602
603 }
604
605 /// <summary>
606 /// Deletes an active agent session
607 /// </summary>
608 /// <param name="request">The request</param>
609 /// <param name="path">The path (eg /bork/narf/test)</param>
610 /// <param name="param">Parameters sent</param>
611 /// <returns>Success "OK" else error</returns>
612 public string RestDeleteUserSessionMethod(string request, string path, string param)
613 {
614 // TODO! Important!
615
616 return "OK";
617 }
618
619 /// <summary>
620 /// Returns an error message that the user could not be found in the database
621 /// </summary>
622 /// <returns>XML string consisting of a error element containing individual error(s)</returns>
623 public string CreateUnknownUserErrorResponse()
624 {
625 System.IO.StringWriter sw = new System.IO.StringWriter();
626 XmlTextWriter xw = new XmlTextWriter(sw);
627
628 // Header
629 xw.Formatting = Formatting.Indented;
630 xw.WriteStartDocument();
631 xw.WriteDocType("error", null, null, null);
632 xw.WriteComment("An error occured");
633 xw.WriteStartElement("error");
634
635 // User
636 xw.WriteElementString("unknownuser", "Unable to find a user with that name");
637
638 // Footer
639 xw.WriteEndElement();
640 xw.Flush();
641 xw.Close();
642
643 return sw.ToString();
644 }
645
646 /// <summary>
647 /// Converts a user profile to an XML element which can be returned
648 /// </summary>
649 /// <param name="profile">The user profile</param>
650 /// <returns>A string containing an XML Document of the user profile</returns>
651 public string ProfileToXml(UserProfileData profile)
652 {
653 System.IO.StringWriter sw = new System.IO.StringWriter();
654 XmlTextWriter xw = new XmlTextWriter(sw);
655
656 // Header
657 xw.Formatting = Formatting.Indented;
658 xw.WriteStartDocument();
659 xw.WriteDocType("userprofile", null, null, null);
660 xw.WriteComment("Found user profiles matching the request");
661 xw.WriteStartElement("users");
662
663 // User
664 xw.WriteStartElement("user");
665 // Account information
666 xw.WriteAttributeString("firstname", profile.username);
667 xw.WriteAttributeString("lastname", profile.surname);
668 xw.WriteAttributeString("uuid", profile.UUID.ToStringHyphenated());
669 // Server Information
670 xw.WriteAttributeString("server_inventory", profile.userInventoryURI);
671 xw.WriteAttributeString("server_asset", profile.userAssetURI);
672 // Profile Information
673 xw.WriteAttributeString("profile_about", profile.profileAboutText);
674 xw.WriteAttributeString("profile_firstlife_about", profile.profileFirstText);
675 xw.WriteAttributeString("profile_firstlife_image", profile.profileFirstImage.ToStringHyphenated());
676 xw.WriteAttributeString("profile_can_do", profile.profileCanDoMask.ToString());
677 xw.WriteAttributeString("profile_want_do", profile.profileWantDoMask.ToString());
678 xw.WriteAttributeString("profile_image", profile.profileImage.ToStringHyphenated());
679 xw.WriteAttributeString("profile_created",profile.created.ToString());
680 xw.WriteAttributeString("profile_lastlogin",profile.lastLogin.ToString());
681 // Home region information
682 xw.WriteAttributeString("home_coordinates", profile.homeLocation.ToString());
683 xw.WriteAttributeString("home_region", profile.homeRegion.ToString());
684 xw.WriteAttributeString("home_look", profile.homeLookAt.ToString());
685
686 xw.WriteEndElement();
687
688 // Footer
689 xw.WriteEndElement();
690 xw.Flush();
691 xw.Close();
692
693 return sw.ToString();
694 }
695
696 public string RestGetUserMethodName(string request, string path, string param)
697 {
698 UserProfileData userProfile = getUserProfile(param.Trim());
699
700 if (userProfile == null)
701 {
702 return CreateUnknownUserErrorResponse();
703 }
704
705 return ProfileToXml(userProfile);
706 }
707
708 public string RestGetUserMethodUUID(string request, string path, string param)
709 {
710 UserProfileData userProfile = getUserProfile(new LLUUID(param));
711
712 if (userProfile == null)
713 {
714 return CreateUnknownUserErrorResponse();
715 }
716
717 return ProfileToXml(userProfile);
718 }
719
720 }
721}
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
index ad5480b..df68722 100644
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
+++ b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 53 <OutputPath>..\..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/OpenGridServices.build b/OpenGridServices.build
index d461ac8..7cfe21e 100644
--- a/OpenGridServices.build
+++ b/OpenGridServices.build
@@ -47,12 +47,13 @@
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="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> 49 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
50 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" /> 50 <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />
51 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" /> 51 <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />
52 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" /> 52 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" />
53 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" /> 53 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" />
54 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" /> 54 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" />
55 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="clean" /> 55 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="clean" />
56 <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="clean" />
56 <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="clean" /> 57 <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="clean" />
57 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> 58 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
58 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> 59 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
@@ -60,14 +61,15 @@
60 </target> 61 </target>
61 62
62 <target name="build" depends="init" description=""> 63 <target name="build" depends="init" description="">
63 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" /> 64 <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" />
64 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" /> 65 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" />
65 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" /> 66 <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" />
66 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="build" /> 67 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="build" />
67 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="build" /> 68 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="build" />
68 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="build" /> 69 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="build" />
69 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> 70 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
70 <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" /> 71 <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" />
72 <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="build" />
71 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> 73 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
72 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" /> 74 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" />
73 <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" /> 75 <nant buildfile="OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" />
@@ -82,12 +84,13 @@
82 <target name="doc" depends="build-release"> 84 <target name="doc" depends="build-release">
83 <echo message="Generating all documentation from all builds" /> 85 <echo message="Generating all documentation from all builds" />
84 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> 86 <nant buildfile="OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
85 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" /> 87 <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />
86 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" /> 88 <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />
87 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" /> 89 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" />
88 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" /> 90 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" />
89 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" /> 91 <nant buildfile="OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" />
90 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="doc" /> 92 <nant buildfile="OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="doc" />
93 <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="doc" />
91 <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="doc" /> 94 <nant buildfile="OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="doc" />
92 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> 95 <nant buildfile="OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
93 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> 96 <nant buildfile="OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 523be71..4772960 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,10 +1,10 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual C# Express 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "OpenGridServices\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"
6EndProject 6EndProject
7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.DB4o", "OpenGridServices\OpenGrid.Framework.Data.DB4o\OpenGrid.Framework.Data.DB4o.csproj", "{39BD9497-0000-0000-0000-000000000000}" 7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.DB4o", "Common\OpenGrid.Framework.Data.DB4o\OpenGrid.Framework.Data.DB4o.csproj", "{39BD9497-0000-0000-0000-000000000000}"
8EndProject 8EndProject
9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MSSQL", "OpenGridServices\OpenGrid.Framework.Data.MSSQL\OpenGrid.Framework.Data.MSSQL.csproj", "{0A563AC1-0000-0000-0000-000000000000}" 9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MSSQL", "OpenGridServices\OpenGrid.Framework.Data.MSSQL\OpenGrid.Framework.Data.MSSQL.csproj", "{0A563AC1-0000-0000-0000-000000000000}"
10EndProject 10EndProject
@@ -14,6 +14,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.SQL
14EndProject 14EndProject
15Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Manager", "OpenGridServices\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj", "{7924FD35-0000-0000-0000-000000000000}" 15Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Manager", "OpenGridServices\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj", "{7924FD35-0000-0000-0000-000000000000}"
16EndProject 16EndProject
17Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.UserManagement", "Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj", "{DA9A7391-0000-0000-0000-000000000000}"
18EndProject
17Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}" 19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}"
18EndProject 20EndProject
19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices\OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" 21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices\OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"
@@ -23,66 +25,61 @@ EndProject
23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" 25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"
24EndProject 26EndProject
25Global 27Global
26 GlobalSection(SolutionConfigurationPlatforms) = preSolution 28 GlobalSection(SolutionConfigurationPlatforms) = preSolution
27 Debug|Any CPU = Debug|Any CPU 29 Debug|Any CPU = Debug|Any CPU
28 Release|Any CPU = Release|Any CPU 30 Release|Any CPU = Release|Any CPU
29 EndGlobalSection 31 EndGlobalSection
30 GlobalSection(ProjectDependencies) = postSolution 32 GlobalSection(ProjectConfigurationPlatforms) = postSolution
31 ({39BD9497-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000}) 33 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32 ({0A563AC1-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000}) 34 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
33 ({0F3C3AC1-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000}) 35 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
34 ({1E3F341A-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000}) 36 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
35 ({21BFC8E2-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000}) 37 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36 ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({7924FD35-0000-0000-0000-000000000000}) 38 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
37 ({66591469-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000}) 39 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
38 EndGlobalSection 40 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
39 GlobalSection(ProjectConfigurationPlatforms) = postSolution 41 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 42 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
41 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 43 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
42 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 44 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
43 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 45 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 46 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
45 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 47 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
46 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 48 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
47 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 49 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 50 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
49 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 51 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
50 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 52 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
51 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 53 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 54 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
53 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 55 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
54 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 56 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
55 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 57 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 58 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
57 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 59 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
58 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 60 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
59 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 61 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 62 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
61 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 63 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
62 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 64 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
63 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 65 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 66 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
65 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 67 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
66 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 68 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
67 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 69 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 70 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
69 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 71 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
70 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 72 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
71 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 73 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 74 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
73 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 75 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
74 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 76 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
75 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 77 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 78 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
77 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 79 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
78 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 80 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
79 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 81 EndGlobalSection
80 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 82 GlobalSection(SolutionProperties) = preSolution
81 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 83 HideSolutionNode = FALSE
82 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 84 EndGlobalSection
83 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
84 EndGlobalSection
85 GlobalSection(SolutionProperties) = preSolution
86 HideSolutionNode = FALSE
87 EndGlobalSection
88EndGlobal 85EndGlobal
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
index fa18c28..64bb78e 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
@@ -76,7 +76,7 @@
76 </Reference> 76 </Reference>
77 </ItemGroup> 77 </ItemGroup>
78 <ItemGroup> 78 <ItemGroup>
79 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> 79 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
80 <Name>OpenGrid.Framework.Data</Name> 80 <Name>OpenGrid.Framework.Data</Name>
81 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 81 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index cc3aacb..c1fc2da 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
@@ -80,7 +80,7 @@
80 </Reference> 80 </Reference>
81 </ItemGroup> 81 </ItemGroup>
82 <ItemGroup> 82 <ItemGroup>
83 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> 83 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
84 <Name>OpenGrid.Framework.Data</Name> 84 <Name>OpenGrid.Framework.Data</Name>
85 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 85 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index 63d0bd9..da42e05 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
@@ -80,7 +80,7 @@
80 </Reference> 80 </Reference>
81 </ItemGroup> 81 </ItemGroup>
82 <ItemGroup> 82 <ItemGroup>
83 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> 83 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
84 <Name>OpenGrid.Framework.Data</Name> 84 <Name>OpenGrid.Framework.Data</Name>
85 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 85 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
index 55a0e02..291f997 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
@@ -100,7 +100,7 @@
100 </Reference> 100 </Reference>
101 </ItemGroup> 101 </ItemGroup>
102 <ItemGroup> 102 <ItemGroup>
103 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> 103 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
104 <Name>OpenGrid.Framework.Data</Name> 104 <Name>OpenGrid.Framework.Data</Name>
105 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 105 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index b3d318c..ad0080a 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
@@ -66,6 +66,10 @@
66 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 66 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
67 <Private>False</Private> 67 <Private>False</Private>
68 </Reference> 68 </Reference>
69 <Reference Include="OpenGrid.Framework.UserManager" >
70 <HintPath>OpenGrid.Framework.UserManager.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
69 <Reference Include="OpenSim.Framework" > 73 <Reference Include="OpenSim.Framework" >
70 <HintPath>OpenSim.Framework.dll</HintPath> 74 <HintPath>OpenSim.Framework.dll</HintPath>
71 <Private>False</Private> 75 <Private>False</Private>
@@ -100,7 +104,7 @@
100 </Reference> 104 </Reference>
101 </ItemGroup> 105 </ItemGroup>
102 <ItemGroup> 106 <ItemGroup>
103 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> 107 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
104 <Name>OpenGrid.Framework.Data</Name> 108 <Name>OpenGrid.Framework.Data</Name>
105 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 109 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 68cbef7..a24003f 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -23,6 +23,7 @@
23 <include name="../../bin/Db4objects.Db4o.dll" /> 23 <include name="../../bin/Db4objects.Db4o.dll" />
24 <include name="../../bin/libsecondlife.dll" /> 24 <include name="../../bin/libsecondlife.dll" />
25 <include name="../../bin/OpenGrid.Framework.Data.dll" /> 25 <include name="../../bin/OpenGrid.Framework.Data.dll" />
26 <include name="../../bin/OpenGrid.Framework.UserManager.dll" />
26 <include name="../../bin/OpenSim.Framework.dll" /> 27 <include name="../../bin/OpenSim.Framework.dll" />
27 <include name="../../bin/OpenSim.Framework.Console.dll" /> 28 <include name="../../bin/OpenSim.Framework.Console.dll" />
28 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> 29 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
diff --git a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
index f512b15..6f5f054 100644
--- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
@@ -38,284 +38,16 @@ using Nwc.XmlRpc;
38using OpenSim.Framework.Sims; 38using OpenSim.Framework.Sims;
39using OpenSim.Framework.Inventory; 39using OpenSim.Framework.Inventory;
40using OpenSim.Framework.Utilities; 40using OpenSim.Framework.Utilities;
41using OpenGrid.Framework.UserManagement;
41 42
42using System.Security.Cryptography; 43using System.Security.Cryptography;
43 44
44namespace OpenGridServices.UserServer 45namespace OpenGridServices.UserServer
45{ 46{
46 public class UserManager 47 public class UserManager : UserManagerBase
47 { 48 {
48 public OpenSim.Framework.Interfaces.UserConfig _config; 49 public UserManager()
49 Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
50
51 /// <summary>
52 /// Adds a new user server plugin - user servers will be requested in the order they were loaded.
53 /// </summary>
54 /// <param name="FileName">The filename to the user server plugin DLL</param>
55 public void AddPlugin(string FileName)
56 {
57 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
58 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
59
60 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
61 foreach (Type pluginType in pluginAssembly.GetTypes())
62 {
63 if (!pluginType.IsAbstract)
64 {
65 Type typeInterface = pluginType.GetInterface("IUserData", true);
66
67 if (typeInterface != null)
68 {
69 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
70 plug.Initialise();
71 this._plugins.Add(plug.getName(), plug);
72 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface");
73 }
74
75 typeInterface = null;
76 }
77 }
78
79 pluginAssembly = null;
80 }
81
82 /// <summary>
83 ///
84 /// </summary>
85 /// <param name="user"></param>
86 public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
87 {
88 UserProfileData user = new UserProfileData();
89 user.homeLocation = new LLVector3(128, 128, 100);
90 user.UUID = LLUUID.Random();
91 user.username = firstName;
92 user.surname = lastName;
93 user.passwordHash = pass;
94 user.passwordSalt = "";
95 user.created = Util.UnixTimeSinceEpoch();
96 user.homeLookAt = new LLVector3(100, 100, 100);
97 user.homeRegion = Util.UIntsToLong((regX * 256), (regY * 256));
98
99 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
100 {
101 try
102 {
103 plugin.Value.addNewUserProfile(user);
104
105 }
106 catch (Exception e)
107 {
108 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
109 }
110 }
111 }
112
113 /// <summary>
114 /// Loads a user profile from a database by UUID
115 /// </summary>
116 /// <param name="uuid">The target UUID</param>
117 /// <returns>A user profile</returns>
118 public UserProfileData getUserProfile(LLUUID uuid)
119 {
120 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
121 {
122 try
123 {
124 UserProfileData profile = plugin.Value.getUserByUUID(uuid);
125 profile.currentAgent = getUserAgent(profile.UUID);
126 return profile;
127 }
128 catch (Exception e)
129 {
130 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
131 }
132 }
133
134 return null;
135 }
136
137
138 /// <summary>
139 /// Loads a user profile by name
140 /// </summary>
141 /// <param name="name">The target name</param>
142 /// <returns>A user profile</returns>
143 public UserProfileData getUserProfile(string name)
144 {
145 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
146 {
147 try
148 {
149 UserProfileData profile = plugin.Value.getUserByName(name);
150 profile.currentAgent = getUserAgent(profile.UUID);
151 return profile;
152 }
153 catch (Exception e)
154 {
155 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
156 }
157 }
158
159 return null;
160 }
161
162 /// <summary>
163 /// Loads a user profile by name
164 /// </summary>
165 /// <param name="fname">First name</param>
166 /// <param name="lname">Last name</param>
167 /// <returns>A user profile</returns>
168 public UserProfileData getUserProfile(string fname, string lname)
169 {
170 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
171 {
172 try
173 {
174 UserProfileData profile = plugin.Value.getUserByName(fname,lname);
175 try
176 {
177 profile.currentAgent = getUserAgent(profile.UUID);
178 }
179 catch (Exception e)
180 {
181 // Ignore
182 }
183 return profile;
184 }
185 catch (Exception e)
186 {
187 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
188 }
189 }
190
191 return null;
192 }
193
194 /// <summary>
195 /// Loads a user agent by uuid (not called directly)
196 /// </summary>
197 /// <param name="uuid">The agents UUID</param>
198 /// <returns>Agent profiles</returns>
199 public UserAgentData getUserAgent(LLUUID uuid)
200 {
201 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
202 {
203 try
204 {
205 return plugin.Value.getAgentByUUID(uuid);
206 }
207 catch (Exception e)
208 {
209 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
210 }
211 }
212
213 return null;
214 }
215
216 /// <summary>
217 /// Loads a user agent by name (not called directly)
218 /// </summary>
219 /// <param name="name">The agents name</param>
220 /// <returns>A user agent</returns>
221 public UserAgentData getUserAgent(string name)
222 { 50 {
223 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
224 {
225 try
226 {
227 return plugin.Value.getAgentByName(name);
228 }
229 catch (Exception e)
230 {
231 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
232 }
233 }
234
235 return null;
236 }
237
238 /// <summary>
239 /// Loads a user agent by name (not called directly)
240 /// </summary>
241 /// <param name="fname">The agents firstname</param>
242 /// <param name="lname">The agents lastname</param>
243 /// <returns>A user agent</returns>
244 public UserAgentData getUserAgent(string fname, string lname)
245 {
246 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
247 {
248 try
249 {
250 return plugin.Value.getAgentByName(fname,lname);
251 }
252 catch (Exception e)
253 {
254 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
255 }
256 }
257
258 return null;
259 }
260
261 /// <summary>
262 /// Creates a error response caused by invalid XML
263 /// </summary>
264 /// <returns>An XMLRPC response</returns>
265 private static XmlRpcResponse CreateErrorConnectingToGridResponse()
266 {
267 XmlRpcResponse response = new XmlRpcResponse();
268 Hashtable ErrorRespData = new Hashtable();
269 ErrorRespData["reason"] = "key";
270 ErrorRespData["message"] = "Error connecting to grid. Could not percieve credentials from login XML.";
271 ErrorRespData["login"] = "false";
272 response.Value = ErrorRespData;
273 return response;
274 }
275
276 /// <summary>
277 /// Creates an error response caused by bad login credentials
278 /// </summary>
279 /// <returns>An XMLRPC response</returns>
280 private static XmlRpcResponse CreateLoginErrorResponse()
281 {
282 XmlRpcResponse response = new XmlRpcResponse();
283 Hashtable ErrorRespData = new Hashtable();
284 ErrorRespData["reason"] = "key";
285 ErrorRespData["message"] = "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.";
286 ErrorRespData["login"] = "false";
287 response.Value = ErrorRespData;
288 return response;
289 }
290
291 /// <summary>
292 /// Creates an error response caused by being logged in already
293 /// </summary>
294 /// <returns>An XMLRPC Response</returns>
295 private static XmlRpcResponse CreateAlreadyLoggedInResponse()
296 {
297 XmlRpcResponse response = new XmlRpcResponse();
298 Hashtable PresenceErrorRespData = new Hashtable();
299 PresenceErrorRespData["reason"] = "presence";
300 PresenceErrorRespData["message"] = "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner";
301 PresenceErrorRespData["login"] = "false";
302 response.Value = PresenceErrorRespData;
303 return response;
304 }
305
306 /// <summary>
307 /// Creates an error response caused by target region being down
308 /// </summary>
309 /// <returns>An XMLRPC Response</returns>
310 private static XmlRpcResponse CreateDeadRegionResponse()
311 {
312 XmlRpcResponse response = new XmlRpcResponse();
313 Hashtable PresenceErrorRespData = new Hashtable();
314 PresenceErrorRespData["reason"] = "key";
315 PresenceErrorRespData["message"] = "The region you are attempting to log into is not responding. Please select another region and try again.";
316 PresenceErrorRespData["login"] = "false";
317 response.Value = PresenceErrorRespData;
318 return response;
319 } 51 }
320 52
321 /// <summary> 53 /// <summary>
@@ -323,7 +55,7 @@ namespace OpenGridServices.UserServer
323 /// </summary> 55 /// </summary>
324 /// <param name="response">The existing response</param> 56 /// <param name="response">The existing response</param>
325 /// <param name="theUser">The user profile</param> 57 /// <param name="theUser">The user profile</param>
326 public virtual void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser) 58 public override void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)
327 { 59 {
328 // Load information from the gridserver 60 // Load information from the gridserver
329 SimProfile SimInfo = new SimProfile(); 61 SimProfile SimInfo = new SimProfile();
@@ -331,7 +63,7 @@ namespace OpenGridServices.UserServer
331 63
332 // Customise the response 64 // Customise the response
333 // Home Location 65 // Home Location
334 response["home"] = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " + 66 response["home"] = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " +
335 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + 67 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
336 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 68 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
337 69
@@ -366,395 +98,5 @@ namespace OpenGridServices.UserServer
366 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 98 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
367 XmlRpcResponse GridResp = GridReq.Send(SimInfo.caps_url, 3000); 99 XmlRpcResponse GridResp = GridReq.Send(SimInfo.caps_url, 3000);
368 } 100 }
369
370 /// <summary>
371 /// Checks a user against it's password hash
372 /// </summary>
373 /// <param name="profile">The users profile</param>
374 /// <param name="password">The supplied password</param>
375 /// <returns>Authenticated?</returns>
376 public bool AuthenticateUser(ref UserProfileData profile, string password)
377 {
378 OpenSim.Framework.Console.MainConsole.Instance.Verbose(
379 "Authenticating " + profile.username + " " + profile.surname);
380
381 password = password.Remove(0, 3); //remove $1$
382
383 string s = Util.Md5Hash(password + ":" + profile.passwordSalt);
384
385 return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase);
386 }
387
388 /// <summary>
389 /// Creates and initialises a new user agent - make sure to use CommitAgent when done to submit to the DB
390 /// </summary>
391 /// <param name="profile">The users profile</param>
392 /// <param name="request">The users loginrequest</param>
393 public void CreateAgent(ref UserProfileData profile, XmlRpcRequest request)
394 {
395 Hashtable requestData = (Hashtable)request.Params[0];
396
397 UserAgentData agent = new UserAgentData();
398
399 // User connection
400 agent.agentIP = "";
401 agent.agentOnline = true;
402 agent.agentPort = 0;
403
404 // Generate sessions
405 RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
406 byte[] randDataS = new byte[16];
407 byte[] randDataSS = new byte[16];
408 rand.GetBytes(randDataS);
409 rand.GetBytes(randDataSS);
410
411 agent.secureSessionID = new LLUUID(randDataSS, 0);
412 agent.sessionID = new LLUUID(randDataS, 0);
413
414 // Profile UUID
415 agent.UUID = profile.UUID;
416
417 // Current position (from Home)
418 agent.currentHandle = profile.homeRegion;
419 agent.currentPos = profile.homeLocation;
420
421 // If user specified additional start, use that
422 if (requestData.ContainsKey("start"))
423 {
424 string startLoc = ((string)requestData["start"]).Trim();
425 if (!(startLoc == "last" || startLoc == "home"))
426 {
427 // Format: uri:Ahern&162&213&34
428 try
429 {
430 string[] parts = startLoc.Remove(0, 4).Split('&');
431 string region = parts[0];
432
433 ////////////////////////////////////////////////////
434 //SimProfile SimInfo = new SimProfile();
435 //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
436 }
437 catch (Exception e)
438 {
439
440 }
441 }
442 }
443
444 // What time did the user login?
445 agent.loginTime = Util.UnixTimeSinceEpoch();
446 agent.logoutTime = 0;
447
448 // Current location
449 agent.regionID = new LLUUID(); // Fill in later
450 agent.currentRegion = new LLUUID(); // Fill in later
451
452 profile.currentAgent = agent;
453 }
454
455 /// <summary>
456 /// Saves a target agent to the database
457 /// </summary>
458 /// <param name="profile">The users profile</param>
459 /// <returns>Successful?</returns>
460 public bool CommitAgent(ref UserProfileData profile)
461 {
462 // Saves the agent to database
463 return true;
464 }
465
466 /// <summary>
467 /// Main user login function
468 /// </summary>
469 /// <param name="request">The XMLRPC request</param>
470 /// <returns>The response to send</returns>
471 public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
472 {
473 XmlRpcResponse response = new XmlRpcResponse();
474 Hashtable requestData = (Hashtable)request.Params[0];
475
476 bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") && requestData.Contains("passwd"));
477 bool GoodLogin = false;
478 string firstname = "";
479 string lastname = "";
480 string passwd = "";
481
482 UserProfileData TheUser;
483
484 if (GoodXML)
485 {
486 firstname = (string)requestData["first"];
487 lastname = (string)requestData["last"];
488 passwd = (string)requestData["passwd"];
489
490 TheUser = getUserProfile(firstname, lastname);
491 if (TheUser == null)
492 return CreateLoginErrorResponse();
493
494 GoodLogin = AuthenticateUser(ref TheUser, passwd);
495 }
496 else
497 {
498 return CreateErrorConnectingToGridResponse();
499 }
500
501 if (!GoodLogin)
502 {
503 return CreateLoginErrorResponse();
504 }
505 else
506 {
507 // If we already have a session...
508 if (TheUser.currentAgent != null && TheUser.currentAgent.agentOnline)
509 {
510 // Reject the login
511 return CreateAlreadyLoggedInResponse();
512 }
513 // Otherwise...
514 // Create a new agent session
515 CreateAgent(ref TheUser, request);
516
517 try
518 {
519 Hashtable responseData = new Hashtable();
520
521 LLUUID AgentID = TheUser.UUID;
522
523 // Global Texture Section
524 Hashtable GlobalT = new Hashtable();
525 GlobalT["sun_texture_id"] = "cce0f112-878f-4586-a2e2-a8f104bba271";
526 GlobalT["cloud_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
527 GlobalT["moon_texture_id"] = "fc4b9f0b-d008-45c6-96a4-01dd947ac621";
528 ArrayList GlobalTextures = new ArrayList();
529 GlobalTextures.Add(GlobalT);
530
531 // Login Flags Section
532 Hashtable LoginFlagsHash = new Hashtable();
533 LoginFlagsHash["daylight_savings"] = "N";
534 LoginFlagsHash["stipend_since_login"] = "N";
535 LoginFlagsHash["gendered"] = "Y"; // Needs to be combined with below...
536 LoginFlagsHash["ever_logged_in"] = "Y"; // Should allow male/female av selection
537 ArrayList LoginFlags = new ArrayList();
538 LoginFlags.Add(LoginFlagsHash);
539
540 // UI Customisation Section
541 Hashtable uiconfig = new Hashtable();
542 uiconfig["allow_first_life"] = "Y";
543 ArrayList ui_config = new ArrayList();
544 ui_config.Add(uiconfig);
545
546 // Classified Categories Section
547 Hashtable ClassifiedCategoriesHash = new Hashtable();
548 ClassifiedCategoriesHash["category_name"] = "Generic";
549 ClassifiedCategoriesHash["category_id"] = (Int32)1;
550 ArrayList ClassifiedCategories = new ArrayList();
551 ClassifiedCategories.Add(ClassifiedCategoriesHash);
552
553 // Inventory Library Section
554 ArrayList AgentInventoryArray = new ArrayList();
555 Hashtable TempHash;
556
557 AgentInventory Library = new AgentInventory();
558 Library.CreateRootFolder(AgentID, true);
559
560 foreach (InventoryFolder InvFolder in Library.InventoryFolders.Values)
561 {
562 TempHash = new Hashtable();
563 TempHash["name"] = InvFolder.FolderName;
564 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
565 TempHash["version"] = (Int32)InvFolder.Version;
566 TempHash["type_default"] = (Int32)InvFolder.DefaultType;
567 TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();
568 AgentInventoryArray.Add(TempHash);
569 }
570
571 Hashtable InventoryRootHash = new Hashtable();
572 InventoryRootHash["folder_id"] = Library.InventoryRoot.FolderID.ToStringHyphenated();
573 ArrayList InventoryRoot = new ArrayList();
574 InventoryRoot.Add(InventoryRootHash);
575
576 Hashtable InitialOutfitHash = new Hashtable();
577 InitialOutfitHash["folder_name"] = "Nightclub Female";
578 InitialOutfitHash["gender"] = "female";
579 ArrayList InitialOutfit = new ArrayList();
580 InitialOutfit.Add(InitialOutfitHash);
581
582 // Circuit Code
583 uint circode = (uint)(Util.RandomClass.Next());
584
585 // Generics
586 responseData["last_name"] = TheUser.surname;
587 responseData["ui-config"] = ui_config;
588 responseData["sim_ip"] = "127.0.0.1"; //SimInfo.sim_ip.ToString();
589 responseData["login-flags"] = LoginFlags;
590 responseData["global-textures"] = GlobalTextures;
591 responseData["classified_categories"] = ClassifiedCategories;
592 responseData["event_categories"] = new ArrayList();
593 responseData["inventory-skeleton"] = AgentInventoryArray;
594 responseData["inventory-skel-lib"] = new ArrayList();
595 responseData["inventory-root"] = InventoryRoot;
596 responseData["event_notifications"] = new ArrayList();
597 responseData["gestures"] = new ArrayList();
598 responseData["inventory-lib-owner"] = new ArrayList();
599 responseData["initial-outfit"] = InitialOutfit;
600 responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
601 responseData["start_location"] = "last";
602 responseData["home"] = "!!null temporary value {home}!!"; // Overwritten
603 responseData["message"] = _config.DefaultStartupMsg;
604 responseData["first_name"] = TheUser.username;
605 responseData["circuit_code"] = (Int32)circode;
606 responseData["sim_port"] = 0; //(Int32)SimInfo.sim_port;
607 responseData["secure_session_id"] = TheUser.currentAgent.secureSessionID.ToStringHyphenated();
608 responseData["look_at"] = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";
609 responseData["agent_id"] = AgentID.ToStringHyphenated();
610 responseData["region_y"] = (Int32)0; // Overwritten
611 responseData["region_x"] = (Int32)0; // Overwritten
612 responseData["seed_capability"] = "";
613 responseData["agent_access"] = "M";
614 responseData["session_id"] = TheUser.currentAgent.sessionID.ToStringHyphenated();
615 responseData["login"] = "true";
616
617 try
618 {
619 this.CustomiseResponse(ref responseData, ref TheUser);
620 }
621 catch (Exception e)
622 {
623 Console.WriteLine(e.ToString());
624 return CreateDeadRegionResponse();
625 }
626
627 CommitAgent(ref TheUser);
628
629 response.Value = responseData;
630 // TheUser.SendDataToSim(SimInfo);
631 return response;
632
633 }
634 catch (Exception E)
635 {
636 Console.WriteLine(E.ToString());
637 }
638 //}
639 }
640 return response;
641
642 }
643
644 /// <summary>
645 /// Deletes an active agent session
646 /// </summary>
647 /// <param name="request">The request</param>
648 /// <param name="path">The path (eg /bork/narf/test)</param>
649 /// <param name="param">Parameters sent</param>
650 /// <returns>Success "OK" else error</returns>
651 public string RestDeleteUserSessionMethod(string request, string path, string param)
652 {
653 // TODO! Important!
654
655 return "OK";
656 }
657
658 /// <summary>
659 /// Returns an error message that the user could not be found in the database
660 /// </summary>
661 /// <returns>XML string consisting of a error element containing individual error(s)</returns>
662 public string CreateUnknownUserErrorResponse()
663 {
664 System.IO.StringWriter sw = new System.IO.StringWriter();
665 XmlTextWriter xw = new XmlTextWriter(sw);
666
667 // Header
668 xw.Formatting = Formatting.Indented;
669 xw.WriteStartDocument();
670 xw.WriteDocType("error", null, null, null);
671 xw.WriteComment("An error occured");
672 xw.WriteStartElement("error");
673
674 // User
675 xw.WriteElementString("unknownuser", "Unable to find a user with that name");
676
677 // Footer
678 xw.WriteEndElement();
679 xw.Flush();
680 xw.Close();
681
682 return sw.ToString();
683 }
684
685 /// <summary>
686 /// Converts a user profile to an XML element which can be returned
687 /// </summary>
688 /// <param name="profile">The user profile</param>
689 /// <returns>A string containing an XML Document of the user profile</returns>
690 public string ProfileToXml(UserProfileData profile)
691 {
692 System.IO.StringWriter sw = new System.IO.StringWriter();
693 XmlTextWriter xw = new XmlTextWriter(sw);
694
695 // Header
696 xw.Formatting = Formatting.Indented;
697 xw.WriteStartDocument();
698 xw.WriteDocType("userprofile", null, null, null);
699 xw.WriteComment("Found user profiles matching the request");
700 xw.WriteStartElement("users");
701
702 // User
703 xw.WriteStartElement("user");
704 // Account information
705 xw.WriteAttributeString("firstname", profile.username);
706 xw.WriteAttributeString("lastname", profile.surname);
707 xw.WriteAttributeString("uuid", profile.UUID.ToStringHyphenated());
708 // Server Information
709 xw.WriteAttributeString("server_inventory", profile.userInventoryURI);
710 xw.WriteAttributeString("server_asset", profile.userAssetURI);
711 // Profile Information
712 xw.WriteAttributeString("profile_about", profile.profileAboutText);
713 xw.WriteAttributeString("profile_firstlife_about", profile.profileFirstText);
714 xw.WriteAttributeString("profile_firstlife_image", profile.profileFirstImage.ToStringHyphenated());
715 xw.WriteAttributeString("profile_can_do", profile.profileCanDoMask.ToString());
716 xw.WriteAttributeString("profile_want_do", profile.profileWantDoMask.ToString());
717 xw.WriteAttributeString("profile_image", profile.profileImage.ToStringHyphenated());
718 xw.WriteAttributeString("profile_created",profile.created.ToString());
719 xw.WriteAttributeString("profile_lastlogin",profile.lastLogin.ToString());
720 // Home region information
721 xw.WriteAttributeString("home_coordinates", profile.homeLocation.ToString());
722 xw.WriteAttributeString("home_region", profile.homeRegion.ToString());
723 xw.WriteAttributeString("home_look", profile.homeLookAt.ToString());
724
725 xw.WriteEndElement();
726
727 // Footer
728 xw.WriteEndElement();
729 xw.Flush();
730 xw.Close();
731
732 return sw.ToString();
733 }
734
735 public string RestGetUserMethodName(string request, string path, string param)
736 {
737 UserProfileData userProfile = getUserProfile(param.Trim());
738
739 if (userProfile == null)
740 {
741 return CreateUnknownUserErrorResponse();
742 }
743
744 return ProfileToXml(userProfile);
745 }
746
747 public string RestGetUserMethodUUID(string request, string path, string param)
748 {
749 UserProfileData userProfile = getUserProfile(new LLUUID(param));
750
751 if (userProfile == null)
752 {
753 return CreateUnknownUserErrorResponse();
754 }
755
756 return ProfileToXml(userProfile);
757 }
758
759 } 101 }
760} 102}
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
index ba50752..a89a38d 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 53 <OutputPath>..\..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/OpenSim.build b/OpenSim.build
index 9eb05c7..a9a5fa5 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -47,6 +47,9 @@
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="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="clean" /> 49 <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="clean" />
50 <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />
51 <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />
52 <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="clean" />
50 <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="clean" /> 53 <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="clean" />
51 <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="clean" /> 54 <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="clean" />
52 <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> 55 <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
@@ -66,8 +69,6 @@
66 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> 69 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
67 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" /> 70 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
68 <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" /> 71 <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
69 <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="clean" />
70 <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="clean" />
71 <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="clean" /> 72 <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="clean" />
72 </target> 73 </target>
73 74
@@ -76,8 +77,6 @@
76 <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> 77 <nant buildfile="Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
77 <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> 78 <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
78 <nant buildfile="Common/OpenSim.Servers/OpenSim.Servers.dll.build" target="build" /> 79 <nant buildfile="Common/OpenSim.Servers/OpenSim.Servers.dll.build" target="build" />
79 <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="build" />
80 <nant buildfile="OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build" target="build" />
81 <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="build" /> 80 <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="build" />
82 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> 81 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
83 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" /> 82 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />
@@ -90,11 +89,14 @@
90 <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> 89 <nant buildfile="OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />
91 <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" /> 90 <nant buildfile="Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />
92 <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" /> 91 <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" />
92 <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" />
93 <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" />
94 <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="build" />
95 <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="build" />
96 <nant buildfile="OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build" target="build" />
93 <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> 97 <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
94 <nant buildfile="OpenSim/OpenSim.Region/OpenSim.Region.dll.build" target="build" /> 98 <nant buildfile="OpenSim/OpenSim.Region/OpenSim.Region.dll.build" target="build" />
95 <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" /> 99 <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" />
96 <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="build" />
97 <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="build" />
98 </target> 100 </target>
99 101
100 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> 102 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
@@ -106,6 +108,9 @@
106 <target name="doc" depends="build-release"> 108 <target name="doc" depends="build-release">
107 <echo message="Generating all documentation from all builds" /> 109 <echo message="Generating all documentation from all builds" />
108 <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="doc" /> 110 <nant buildfile="Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build" target="doc" />
111 <nant buildfile="Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />
112 <nant buildfile="Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />
113 <nant buildfile="Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.dll.build" target="doc" />
109 <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="doc" /> 114 <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="doc" />
110 <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="doc" /> 115 <nant buildfile="OpenSim/OpenSim.Caches/OpenSim.Caches.dll.build" target="doc" />
111 <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> 116 <nant buildfile="Common/OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
@@ -125,8 +130,6 @@
125 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> 130 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
126 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" /> 131 <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
127 <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" /> 132 <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
128 <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="doc" />
129 <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="doc" />
130 <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="doc" /> 133 <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="doc" />
131 </target> 134 </target>
132 135
diff --git a/OpenSim.sln b/OpenSim.sln
index 3c2d95b..a3a1051 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,7 +1,13 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual C# Express 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"
6EndProject
7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.DB4o", "Common\OpenGrid.Framework.Data.DB4o\OpenGrid.Framework.Data.DB4o.csproj", "{39BD9497-0000-0000-0000-000000000000}"
8EndProject
9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.UserManagement", "Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj", "{DA9A7391-0000-0000-0000-000000000000}"
10EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" 11Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
6EndProject 12EndProject
7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Caches", "OpenSim\OpenSim.Caches\OpenSim.Caches.csproj", "{1938EB12-0000-0000-0000-000000000000}" 13Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Caches", "OpenSim\OpenSim.Caches\OpenSim.Caches.csproj", "{1938EB12-0000-0000-0000-000000000000}"
@@ -40,112 +46,179 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorag
40EndProject 46EndProject
41Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" 47Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
42EndProject 48EndProject
43Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"
44EndProject
45Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp2", "OpenSim\Examples\SimpleApp2\SimpleApp2.csproj", "{24DF2448-0000-0000-0000-000000000000}"
46EndProject
47Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" 49Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
48EndProject 50EndProject
49Global 51Global
50 GlobalSection(SolutionConfigurationPlatforms) = preSolution 52 GlobalSection(SolutionConfigurationPlatforms) = preSolution
51 Debug|Any CPU = Debug|Any CPU 53 Debug|Any CPU = Debug|Any CPU
52 Release|Any CPU = Release|Any CPU 54 Release|Any CPU = Release|Any CPU
53 EndGlobalSection 55 EndGlobalSection
54 GlobalSection(ProjectConfigurationPlatforms) = postSolution 56 GlobalSection(ProjectDependencies) = postSolution
55 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 57 ({683344D5-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})
56 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 58 ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
57 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 59 ({39BD9497-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
58 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 60 ({DA9A7391-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
59 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 61 ({DA9A7391-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
60 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 62 ({DA9A7391-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
61 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 63 ({DA9A7391-0000-0000-0000-000000000000}).5 = ({E88EF749-0000-0000-0000-000000000000})
62 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 64 ({DA9A7391-0000-0000-0000-000000000000}).6 = ({8BB20F0A-0000-0000-0000-000000000000})
63 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 65 ({DA9A7391-0000-0000-0000-000000000000}).10 = ({8E81D43C-0000-0000-0000-000000000000})
64 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 66 ({438A9556-0000-0000-0000-000000000000}).3 = ({683344D5-0000-0000-0000-000000000000})
65 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 67 ({438A9556-0000-0000-0000-000000000000}).4 = ({1938EB12-0000-0000-0000-000000000000})
66 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 68 ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
67 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 69 ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
68 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 70 ({438A9556-0000-0000-0000-000000000000}).7 = ({E88EF749-0000-0000-0000-000000000000})
69 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 71 ({438A9556-0000-0000-0000-000000000000}).8 = ({79CED992-0000-0000-0000-000000000000})
70 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 72 ({438A9556-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
71 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 73 ({438A9556-0000-0000-0000-000000000000}).10 = ({196916AF-0000-0000-0000-000000000000})
72 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 74 ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000})
73 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 75 ({438A9556-0000-0000-0000-000000000000}).12 = ({8BB20F0A-0000-0000-0000-000000000000})
74 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 76 ({438A9556-0000-0000-0000-000000000000}).13 = ({2270B8FE-0000-0000-0000-000000000000})
75 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 77 ({438A9556-0000-0000-0000-000000000000}).16 = ({8E81D43C-0000-0000-0000-000000000000})
76 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 78 ({1938EB12-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
77 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 79 ({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
78 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 80 ({8ACA2445-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
79 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 81 ({E88EF749-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000})
80 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 82 ({546099CD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
81 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 83 ({546099CD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
82 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 84 ({B55C0B5D-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
83 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 85 ({B55C0B5D-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
84 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 86 ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
85 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 87 ({79CED992-0000-0000-0000-000000000000}).1 = ({683344D5-0000-0000-0000-000000000000})
86 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 88 ({79CED992-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
87 {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 89 ({79CED992-0000-0000-0000-000000000000}).3 = ({DA9A7391-0000-0000-0000-000000000000})
88 {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 90 ({79CED992-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
89 {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 91 ({4F874463-0000-0000-0000-000000000000}).1 = ({8BE16150-0000-0000-0000-000000000000})
90 {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 92 ({8BE16150-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
91 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 93 ({8BE16150-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
92 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 94 ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
93 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 95 ({988F0AC4-0000-0000-0000-000000000000}).1 = ({8BE16150-0000-0000-0000-000000000000})
94 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 96 ({196916AF-0000-0000-0000-000000000000}).3 = ({683344D5-0000-0000-0000-000000000000})
95 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 97 ({196916AF-0000-0000-0000-000000000000}).4 = ({1938EB12-0000-0000-0000-000000000000})
96 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 98 ({196916AF-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
97 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 99 ({196916AF-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
98 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 100 ({196916AF-0000-0000-0000-000000000000}).7 = ({E88EF749-0000-0000-0000-000000000000})
99 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 101 ({196916AF-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})
100 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 102 ({196916AF-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
101 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 103 ({196916AF-0000-0000-0000-000000000000}).10 = ({2270B8FE-0000-0000-0000-000000000000})
102 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 104 ({196916AF-0000-0000-0000-000000000000}).13 = ({8E81D43C-0000-0000-0000-000000000000})
103 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 105 ({632E1BFD-0000-0000-0000-000000000000}).3 = ({1938EB12-0000-0000-0000-000000000000})
104 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 106 ({632E1BFD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
105 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 107 ({632E1BFD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
106 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 108 ({632E1BFD-0000-0000-0000-000000000000}).6 = ({E88EF749-0000-0000-0000-000000000000})
107 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 109 ({632E1BFD-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000})
108 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 110 ({632E1BFD-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000})
109 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 111 ({632E1BFD-0000-0000-0000-000000000000}).9 = ({2270B8FE-0000-0000-0000-000000000000})
110 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 112 ({632E1BFD-0000-0000-0000-000000000000}).12 = ({8E81D43C-0000-0000-0000-000000000000})
111 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 113 ({8BB20F0A-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
112 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 114 ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
113 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 115 ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000})
114 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 116 ({EE9E5D96-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
115 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 117 ({EE9E5D96-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
116 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 118 ({E1B79ECF-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
117 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 119 ({E1B79ECF-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
118 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 120 ({6B20B603-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
119 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 121 ({6B20B603-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
120 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 122 EndGlobalSection
121 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 123 GlobalSection(ProjectConfigurationPlatforms) = postSolution
122 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 124 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
123 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 125 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
124 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 126 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
125 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 127 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
126 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 128 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
127 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 129 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
128 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 130 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
129 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 131 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
130 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 132 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 133 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
132 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 134 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
133 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 135 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
134 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 136 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 137 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
136 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 138 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
137 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 139 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
138 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 140 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139 {24DF2448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 141 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
140 {24DF2448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 142 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
141 {24DF2448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 143 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
142 {24DF2448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 144 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 145 {1938EB12-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
144 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 146 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
145 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 147 {1938EB12-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
146 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 148 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
147 EndGlobalSection 149 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
148 GlobalSection(SolutionProperties) = preSolution 150 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
149 HideSolutionNode = FALSE 151 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
150 EndGlobalSection 152 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
154 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
155 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
156 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
158 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
159 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
160 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
161 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
162 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
163 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
164 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
166 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
167 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
168 {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
169 {79CED992-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
170 {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
171 {79CED992-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
172 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
173 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
174 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
175 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
176 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
177 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
178 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
179 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
180 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
181 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
182 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
183 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
184 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
185 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
186 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
187 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
188 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
189 {196916AF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
190 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
191 {196916AF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
192 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
193 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
194 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
195 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
196 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
197 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
198 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
199 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
200 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
201 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
202 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
203 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
204 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
205 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
206 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
207 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
208 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
209 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
210 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
211 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
212 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
213 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
214 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
215 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
216 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
217 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
218 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
219 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
220 EndGlobalSection
221 GlobalSection(SolutionProperties) = preSolution
222 HideSolutionNode = FALSE
223 EndGlobalSection
151EndGlobal 224EndGlobal
diff --git a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
index fb7dc7d..795f99d 100644
--- a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
+++ b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
@@ -35,21 +35,19 @@ using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36using OpenGrid.Framework.Communications; 36using OpenGrid.Framework.Communications;
37 37
38using OpenSim.LocalCommunications.LocalUserManagement;
39 38
40namespace OpenSim.LocalCommunications 39namespace OpenSim.LocalCommunications
41{ 40{
42 public class CommunicationsLocal : CommunicationsManager 41 public class CommunicationsLocal : CommunicationsManager
43 { 42 {
44 public LocalBackEndServices SandBoxManager = new LocalBackEndServices(); 43 public LocalBackEndServices SandBoxServices = new LocalBackEndServices();
45 public LocalUserServices UserServices = new LocalUserServices(); 44 protected LocalUserServices UserServices = new LocalUserServices();
46 45
47 public CommunicationsLocal() 46 public CommunicationsLocal()
48 { 47 {
49
50 UserServer = UserServices; 48 UserServer = UserServices;
51 GridServer = SandBoxManager; 49 GridServer = SandBoxServices;
52 InterRegion = SandBoxManager; 50 InterRegion = SandBoxServices;
53 } 51 }
54 } 52 }
55} 53}
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs
deleted file mode 100644
index f438117..0000000
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs
+++ /dev/null
@@ -1,36 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5using OpenGrid.Framework.Communications;
6using OpenSim.Framework.User;
7
8using libsecondlife;
9
10namespace OpenSim.LocalCommunications.LocalUserManagement
11{
12 public class LocalUserServices : IUserServices
13 {
14 public UserProfileManager userProfileManager = new UserProfileManager();
15 public LocalLoginService localLoginService;
16 public LocalUserServices()
17 {
18 localLoginService = new LocalLoginService(this);
19 }
20
21 public UserProfile GetUserProfile(string first_name, string last_name)
22 {
23 return GetUserProfile(first_name + " " + last_name);
24 }
25
26 public UserProfile GetUserProfile(string name)
27 {
28 return null;
29 }
30 public UserProfile GetUserProfile(LLUUID avatar_id)
31 {
32 return null;
33 }
34
35 }
36}
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs
deleted file mode 100644
index 5f9d028..0000000
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs
+++ /dev/null
@@ -1,42 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5using libsecondlife;
6using OpenSim.Framework.User;
7
8namespace OpenSim.LocalCommunications.LocalUserManagement
9{
10 public class UserProfileManager
11 {
12 Dictionary<LLUUID, UserProfile> userProfiles = new Dictionary<LLUUID, UserProfile>();
13
14 public UserProfileManager()
15 {
16 }
17
18 private LLUUID getUserUUID(string first_name, string last_name)
19 {
20 return getUserUUID(first_name + " " + last_name);
21 }
22 private LLUUID getUserUUID(string name)
23 {
24 return null;
25 }
26
27
28 public UserProfile getUserProfile(string first_name, string last_name)
29 {
30 return getUserProfile(first_name + " " + last_name);
31 }
32 public UserProfile getUserProfile(string name)
33 {
34 return null;
35 }
36 public UserProfile getUserProfile(LLUUID user_id)
37 {
38 return null;
39 }
40
41 }
42}
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
new file mode 100644
index 0000000..0fe52a7
--- /dev/null
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
@@ -0,0 +1,43 @@
1using System;
2using System.Collections;
3using System.Collections.Generic;
4using System.Text;
5
6using OpenGrid.Framework.Communications;
7using OpenSim.Framework.User;
8using OpenGrid.Framework.UserManagement;
9using OpenGrid.Framework.Data;
10
11using libsecondlife;
12
13namespace OpenSim.LocalCommunications
14{
15 public class LocalUserServices : UserManagerBase, IUserServices
16 {
17
18 public LocalUserServices()
19 {
20
21 }
22
23 public UserProfileData GetUserProfile(string first_name, string last_name)
24 {
25 return GetUserProfile(first_name + " " + last_name);
26 }
27
28 public UserProfileData GetUserProfile(string name)
29 {
30 return null;
31 }
32 public UserProfileData GetUserProfile(LLUUID avatar_id)
33 {
34 return null;
35 }
36
37 public override void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)
38 {
39
40 }
41
42 }
43}
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
index f7c28eb..3cb36da 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
+++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
@@ -1,4 +1,4 @@
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>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{79CED992-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{79CED992-0000-0000-0000-000000000000}</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.LocalCommunications</AssemblyName> 12 <AssemblyName>OpenSim.LocalCommunications</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.LocalCommunications</RootNamespace> 19 <RootNamespace>OpenSim.LocalCommunications</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,20 +55,18 @@
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="libsecondlife.dll"> 61 <Reference Include="libsecondlife.dll" >
69 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System"> 65 <Reference Include="System" >
73 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Data" /> 69 <Reference Include="System.Xml" >
77 <Reference Include="System.Xml">
78 <HintPath>System.Xml.dll</HintPath> 70 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private> 71 <Private>False</Private>
80 </Reference> 72 </Reference>
@@ -84,13 +76,25 @@
84 <Name>OpenGrid.Framework.Communications</Name> 76 <Name>OpenGrid.Framework.Communications</Name>
85 <Project>{683344D5-0000-0000-0000-000000000000}</Project> 77 <Project>{683344D5-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 79 <Private>False</Private>
80 </ProjectReference>
81 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
82 <Name>OpenGrid.Framework.Data</Name>
83 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
84 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
85 <Private>False</Private>
86 </ProjectReference>
87 <ProjectReference Include="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj">
88 <Name>OpenGrid.Framework.UserManagement</Name>
89 <Project>{DA9A7391-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private>
88 </ProjectReference> 92 </ProjectReference>
89 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> 93 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
90 <Name>OpenSim.Framework</Name> 94 <Name>OpenSim.Framework</Name>
91 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 95 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 97 <Private>False</Private>
94 </ProjectReference> 98 </ProjectReference>
95 </ItemGroup> 99 </ItemGroup>
96 <ItemGroup> 100 <ItemGroup>
@@ -100,9 +104,9 @@
100 <Compile Include="LocalBackEndServices.cs"> 104 <Compile Include="LocalBackEndServices.cs">
101 <SubType>Code</SubType> 105 <SubType>Code</SubType>
102 </Compile> 106 </Compile>
103 <Compile Include="LocalUserManagement\LocalLoginService.cs" /> 107 <Compile Include="LocalUserServices.cs">
104 <Compile Include="LocalUserManagement\LocalUserServices.cs" /> 108 <SubType>Code</SubType>
105 <Compile Include="LocalUserManagement\UserProfileManager.cs" /> 109 </Compile>
106 <Compile Include="Properties\AssemblyInfo.cs"> 110 <Compile Include="Properties\AssemblyInfo.cs">
107 <SubType>Code</SubType> 111 <SubType>Code</SubType>
108 </Compile> 112 </Compile>
@@ -114,4 +118,4 @@
114 <PostBuildEvent> 118 <PostBuildEvent>
115 </PostBuildEvent> 119 </PostBuildEvent>
116 </PropertyGroup> 120 </PropertyGroup>
117</Project> \ No newline at end of file 121</Project>
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user
index 518ce40..5941547 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user
+++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user
@@ -2,7 +2,7 @@
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\Documents and Settings\Stefan\My Documents\source\opensim\branches\Sugilite\bin\</ReferencePath> 5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion> 6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView> 7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust> 8 <ProjectTrust>0</ProjectTrust>
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
index 2ea6497..2b72e2d 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
+++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
@@ -13,6 +13,7 @@
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="CommunicationsLocal.cs" /> 14 <include name="CommunicationsLocal.cs" />
15 <include name="LocalBackEndServices.cs" /> 15 <include name="LocalBackEndServices.cs" />
16 <include name="LocalUserServices.cs" />
16 <include name="Properties/AssemblyInfo.cs" /> 17 <include name="Properties/AssemblyInfo.cs" />
17 </sources> 18 </sources>
18 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
@@ -22,6 +23,8 @@
22 </lib> 23 </lib>
23 <include name="../../bin/libsecondlife.dll" /> 24 <include name="../../bin/libsecondlife.dll" />
24 <include name="../../bin/OpenGrid.Framework.Communications.dll" /> 25 <include name="../../bin/OpenGrid.Framework.Communications.dll" />
26 <include name="../../bin/OpenGrid.Framework.Data.dll" />
27 <include name="../../bin/OpenGrid.Framework.UserManagement.dll" />
25 <include name="../../bin/OpenSim.Framework.dll" /> 28 <include name="../../bin/OpenSim.Framework.dll" />
26 <include name="System.dll" /> 29 <include name="System.dll" />
27 <include name="System.Xml.dll" /> 30 <include name="System.Xml.dll" />
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
index 5f8b0ed..f88eb32 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 53 <OutputPath>..\..\..\bin\Physics\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
index 22d7786..08f54aa 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 53 <OutputPath>..\..\..\bin\Physics\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
index 0cebe66..aa89cc1 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 53 <OutputPath>..\..\..\bin\Physics\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 2a5d6ec..94efbed 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 53 <OutputPath>..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 17a651d..63eeb9c 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 53 <OutputPath>..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
index 10bc0fd..694521b 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 53 <OutputPath>..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj
index df3a32c..fb0e0c1 100644
--- a/OpenSim/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim/OpenSim.csproj
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 53 <OutputPath>..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index dddcaea..762b9e1 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -134,7 +134,7 @@ namespace OpenSim
134 { 134 {
135 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false); 135 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);
136 loginServer.Startup(); 136 loginServer.Startup();
137 loginServer.SetSessionHandler(sandboxCommunications.SandBoxManager.AddNewSession); 137 loginServer.SetSessionHandler(sandboxCommunications.SandBoxServices.AddNewSession);
138 //sandbox mode with loginserver not using accounts 138 //sandbox mode with loginserver not using accounts
139 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod); 139 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
140 } 140 }
diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build
index c6c4660..395fb31 100644
--- a/Prebuild/Prebuild.build
+++ b/Prebuild/Prebuild.build
@@ -12,6 +12,13 @@
12 <property name="build.debug" value="true" /> 12 <property name="build.debug" value="true" />
13 </target> 13 </target>
14 14
15 <property name="project.config" value="Release" />
16
17 <target name="Release" description="">
18 <property name="project.config" value="Release" />
19 <property name="build.debug" value="false" />
20 </target>
21
15 <target name="net-1.1" description="Sets framework to .NET 1.1"> 22 <target name="net-1.1" description="Sets framework to .NET 1.1">
16 <property name="nant.settings.currentframework" value="net-1.1" /> 23 <property name="nant.settings.currentframework" value="net-1.1" />
17 </target> 24 </target>
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 440c8ba..449896b 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -5,10 +5,13 @@ EndProject
5Global 5Global
6 GlobalSection(SolutionConfigurationPlatforms) = preSolution 6 GlobalSection(SolutionConfigurationPlatforms) = preSolution
7 Debug|Any CPU = Debug|Any CPU 7 Debug|Any CPU = Debug|Any CPU
8 Release|Any CPU = Release|Any CPU
8 EndGlobalSection 9 EndGlobalSection
9 GlobalSection(ProjectConfigurationPlatforms) = postSolution 10 GlobalSection(ProjectConfigurationPlatforms) = postSolution
10 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 11 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
11 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 12 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
13 {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
14 {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
12 EndGlobalSection 15 EndGlobalSection
13 GlobalSection(SolutionProperties) = preSolution 16 GlobalSection(SolutionProperties) = preSolution
14 HideSolutionNode = FALSE 17 HideSolutionNode = FALSE
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index bda6129..c8b859c 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -41,6 +41,24 @@
41 <WarningLevel>4</WarningLevel> 41 <WarningLevel>4</WarningLevel>
42 <NoWarn>1595</NoWarn> 42 <NoWarn>1595</NoWarn>
43 </PropertyGroup> 43 </PropertyGroup>
44 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
45 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
46 <BaseAddress>285212672</BaseAddress>
47 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
48 <ConfigurationOverrideFile>
49 </ConfigurationOverrideFile>
50 <DefineConstants>TRACE</DefineConstants>
51 <DocumentationFile></DocumentationFile>
52 <DebugSymbols>False</DebugSymbols>
53 <FileAlignment>4096</FileAlignment>
54 <Optimize>True</Optimize>
55 <OutputPath>..\..\bin\</OutputPath>
56 <RegisterForComInterop>False</RegisterForComInterop>
57 <RemoveIntegerChecks>False</RemoveIntegerChecks>
58 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
59 <WarningLevel>4</WarningLevel>
60 <NoWarn>1595</NoWarn>
61 </PropertyGroup>
44 <ItemGroup> 62 <ItemGroup>
45 <Reference Include="System" > 63 <Reference Include="System" >
46 <HintPath>System.dll</HintPath> 64 <HintPath>System.dll</HintPath>
diff --git a/prebuild.xml b/prebuild.xml
index 6b25abd..cbe688d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -33,7 +33,7 @@
33 </Configuration> 33 </Configuration>
34 34
35 <!-- XML-RPC --> 35 <!-- XML-RPC -->
36 <Project name="XMLRPC" path="Common/XmlRpcCS" type="Library"> 36 <Project name="XMLRPC" path="Common/XmlRpcCS" type="Library">
37 <Configuration name="Debug"> 37 <Configuration name="Debug">
38 <Options> 38 <Options>
39 <OutputPath>../../bin/</OutputPath> 39 <OutputPath>../../bin/</OutputPath>
@@ -93,7 +93,7 @@
93 <Reference name="libsecondlife.dll"/> 93 <Reference name="libsecondlife.dll"/>
94 <Reference name="Db4objects.Db4o.dll"/> 94 <Reference name="Db4objects.Db4o.dll"/>
95 <Reference name="XMLRPC"/> 95 <Reference name="XMLRPC"/>
96 <Reference name="OpenSim.Framework.Console"/> 96 <Reference name="OpenSim.Framework.Console"/>
97 <Files> 97 <Files>
98 <Match pattern="*.cs" recurse="true"/> 98 <Match pattern="*.cs" recurse="true"/>
99 </Files> 99 </Files>
@@ -114,58 +114,10 @@
114 <ReferencePath>../../bin/</ReferencePath> 114 <ReferencePath>../../bin/</ReferencePath>
115 <Reference name="System"/> 115 <Reference name="System"/>
116 <Reference name="System.Xml"/> 116 <Reference name="System.Xml"/>
117 <Reference name="OpenSim.Framework"/> 117 <Reference name="OpenSim.Framework"/>
118 <Reference name="OpenSim.Framework.Console"/> 118 <Reference name="OpenSim.Framework.Console"/>
119 <Reference name="libsecondlife.dll"/> 119 <Reference name="libsecondlife.dll"/>
120 <Reference name="XMLRPC"/> 120 <Reference name="XMLRPC"/>
121
122 <Files>
123 <Match pattern="*.cs" recurse="true"/>
124 </Files>
125 </Project>
126
127 <!-- OpenGridFrameWork.Communications" -->
128 <Project name="OpenGrid.Framework.Communications" path="Common/OpenGrid.Framework.Communications" type="Library">
129 <Configuration name="Debug">
130 <Options>
131 <OutputPath>../../bin/</OutputPath>
132 </Options>
133 </Configuration>
134 <Configuration name="Release">
135 <Options>
136 <OutputPath>../../bin/</OutputPath>
137 </Options>
138 </Configuration>
139
140 <ReferencePath>../../bin/</ReferencePath>
141 <Reference name="System"/>
142 <Reference name="System.Xml"/>
143 <Reference name="OpenSim.Framework"/>
144 <Reference name="libsecondlife.dll"/>
145
146 <Files>
147 <Match pattern="*.cs" recurse="true"/>
148 </Files>
149 </Project>
150
151 <Project name="OpenSim.LocalCommunications" path="OpenSim/OpenSim.LocalCommunications" type="Library">
152 <Configuration name="Debug">
153 <Options>
154 <OutputPath>../../bin/</OutputPath>
155 </Options>
156 </Configuration>
157 <Configuration name="Release">
158 <Options>
159 <OutputPath>../../bin/</OutputPath>
160 </Options>
161 </Configuration>
162
163 <ReferencePath>../../bin/</ReferencePath>
164 <Reference name="System"/>
165 <Reference name="System.Xml"/>
166 <Reference name="OpenGrid.Framework.Communications"/>
167 <Reference name="libsecondlife.dll"/>
168 <Reference name="OpenSim.Framework"/>
169 121
170 <Files> 122 <Files>
171 <Match pattern="*.cs" recurse="true"/> 123 <Match pattern="*.cs" recurse="true"/>
@@ -188,7 +140,7 @@
188 <Reference name="System"/> 140 <Reference name="System"/>
189 <Reference name="System.Xml"/> 141 <Reference name="System.Xml"/>
190 <Reference name="libsecondlife.dll"/> 142 <Reference name="libsecondlife.dll"/>
191 <Reference name="OpenSim.Framework"/> 143 <Reference name="OpenSim.Framework"/>
192 <Files> 144 <Files>
193 <Match pattern="*.cs" recurse="true"/> 145 <Match pattern="*.cs" recurse="true"/>
194 </Files> 146 </Files>
@@ -219,7 +171,7 @@
219 <Match pattern="*.cs" recurse="true"/> 171 <Match pattern="*.cs" recurse="true"/>
220 </Files> 172 </Files>
221 </Project> 173 </Project>
222 174
223 <Project name="OpenSim.Storage.LocalStorageSQLite" path="OpenSim/OpenSim.Storage/LocalStorageSQLite" type="Library"> 175 <Project name="OpenSim.Storage.LocalStorageSQLite" path="OpenSim/OpenSim.Storage/LocalStorageSQLite" type="Library">
224 <Configuration name="Debug"> 176 <Configuration name="Debug">
225 <Options> 177 <Options>
@@ -319,7 +271,7 @@
319 <Match pattern="*.cs" recurse="true"/> 271 <Match pattern="*.cs" recurse="true"/>
320 </Files> 272 </Files>
321 </Project> 273 </Project>
322 274
323 275
324 <Project name="OpenSim.Physics.Manager" path="OpenSim/OpenSim.Physics/Manager" type="Library"> 276 <Project name="OpenSim.Physics.Manager" path="OpenSim/OpenSim.Physics/Manager" type="Library">
325 <Configuration name="Debug"> 277 <Configuration name="Debug">
@@ -352,6 +304,11 @@
352 <OutputPath>../../../bin/Physics/</OutputPath> 304 <OutputPath>../../../bin/Physics/</OutputPath>
353 </Options> 305 </Options>
354 </Configuration> 306 </Configuration>
307 <Configuration name="Release">
308 <Options>
309 <OutputPath>../../../bin/Physics/</OutputPath>
310 </Options>
311 </Configuration>
355 312
356 <ReferencePath>../../../bin/</ReferencePath> 313 <ReferencePath>../../../bin/</ReferencePath>
357 <Reference name="System" localCopy="false"/> 314 <Reference name="System" localCopy="false"/>
@@ -368,6 +325,11 @@
368 <OutputPath>../../../bin/Physics/</OutputPath> 325 <OutputPath>../../../bin/Physics/</OutputPath>
369 </Options> 326 </Options>
370 </Configuration> 327 </Configuration>
328 <Configuration name="Release">
329 <Options>
330 <OutputPath>../../../bin/Physics/</OutputPath>
331 </Options>
332 </Configuration>
371 333
372 <ReferencePath>../../../bin/</ReferencePath> 334 <ReferencePath>../../../bin/</ReferencePath>
373 <Reference name="System" localCopy="false"/> 335 <Reference name="System" localCopy="false"/>
@@ -385,43 +347,58 @@
385 <OutputPath>../../../bin/Physics/</OutputPath> 347 <OutputPath>../../../bin/Physics/</OutputPath>
386 </Options> 348 </Options>
387 </Configuration> 349 </Configuration>
350 <Configuration name="Release">
351 <Options>
352 <OutputPath>../../../bin/Physics/</OutputPath>
353 </Options>
354 </Configuration>
388 355
389 <ReferencePath>../../../bin/</ReferencePath> 356 <ReferencePath>../../../bin/</ReferencePath>
390 <Reference name="System" localCopy="false"/> 357 <Reference name="System" localCopy="false"/>
391 <Reference name="Axiom.MathLib.dll" localCopy="false"/> 358 <Reference name="Axiom.MathLib.dll" localCopy="false"/>
392 <Reference name="OpenSim.Physics.Manager" localCopy="false"/> 359 <Reference name="OpenSim.Physics.Manager" localCopy="false"/>
393 <Reference name="Ode.NET.dll" localCopy="false" /> 360 <Reference name="Ode.NET.dll" localCopy="false" />
394 361
395 <Files> 362 <Files>
396 <Match pattern="*.cs" recurse="true"/> 363 <Match pattern="*.cs" recurse="true"/>
397 </Files> 364 </Files>
398 </Project> 365 </Project>
399 366
400 <!-- Xml Config Dll --> 367 <!-- Xml Config Dll -->
401 <Project name="OpenSim.GenericConfig.Xml" path="Common/OpenSim.GenericConfig/Xml" type="Library"> 368 <Project name="OpenSim.GenericConfig.Xml" path="Common/OpenSim.GenericConfig/Xml" type="Library">
402 <Configuration name="Debug"> 369 <Configuration name="Debug">
403 <Options> 370 <Options>
404 <OutputPath>../../../bin/</OutputPath> 371 <OutputPath>../../../bin/</OutputPath>
405 </Options> 372 </Options>
406 </Configuration> 373 </Configuration>
374 <Configuration name="Release">
375 <Options>
376 <OutputPath>../../../bin/</OutputPath>
377 </Options>
378 </Configuration>
407 379
408 <ReferencePath>../../../bin/</ReferencePath> 380 <ReferencePath>../../../bin/</ReferencePath>
409 <Reference name="System"/> 381 <Reference name="System"/>
410 <Reference name="System.Xml"/> 382 <Reference name="System.Xml"/>
411 <Reference name="OpenSim.Framework"/> 383 <Reference name="OpenSim.Framework"/>
412 384
413 <Files> 385 <Files>
414 <Match pattern="*.cs" recurse="true"/> 386 <Match pattern="*.cs" recurse="true"/>
415 </Files> 387 </Files>
416 </Project> 388 </Project>
417 389
418 <!-- Terrain engine --> 390 <!-- Terrain engine -->
419 <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim/OpenSim.Terrain.BasicTerrain" type="Library"> 391 <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim/OpenSim.Terrain.BasicTerrain" type="Library">
420 <Configuration name="Debug"> 392 <Configuration name="Debug">
421 <Options> 393 <Options>
422 <OutputPath>../../bin/</OutputPath> 394 <OutputPath>../../bin/</OutputPath>
423 </Options> 395 </Options>
424 </Configuration> 396 </Configuration>
397 <Configuration name="Release">
398 <Options>
399 <OutputPath>../../bin/</OutputPath>
400 </Options>
401 </Configuration>
425 402
426 <ReferencePath>../../bin/</ReferencePath> 403 <ReferencePath>../../bin/</ReferencePath>
427 <Reference name="System"/> 404 <Reference name="System"/>
@@ -436,69 +413,145 @@
436 </Files> 413 </Files>
437 </Project> 414 </Project>
438 415
439 <Project name="OpenSim.RegionServer" path="OpenSim/OpenSim.RegionServer" type="Library"> 416 <Project name="OpenGrid.Framework.Data" path="Common/OpenGrid.Framework.Data" type="Library">
440 <Configuration name="Debug"> 417 <Configuration name="Debug">
441 <Options> 418 <Options>
442 <OutputPath>../../bin/</OutputPath> 419 <OutputPath>../../bin/</OutputPath>
443 </Options> 420 </Options>
444 </Configuration> 421 </Configuration>
422 <Configuration name="Release">
423 <Options>
424 <OutputPath>../../bin/</OutputPath>
425 </Options>
426 </Configuration>
445 427
446 <ReferencePath>../../bin/</ReferencePath> 428 <ReferencePath>../../bin/</ReferencePath>
447 <Reference name="System" localCopy="false"/> 429 <Reference name="System" localCopy="false"/>
448 <Reference name="System.Xml"/> 430 <Reference name="System.Xml"/>
431 <Reference name="System.Data"/>
449 <Reference name="libsecondlife.dll"/> 432 <Reference name="libsecondlife.dll"/>
450 <Reference name="Axiom.MathLib.dll"/>
451 <Reference name="Db4objects.Db4o.dll"/>
452 <Reference name="OpenSim.Terrain.BasicTerrain"/>
453 <Reference name="OpenSim.Framework"/>
454 <Reference name="OpenSim.Framework.Console"/>
455 <Reference name="OpenSim.GenericConfig.Xml"/>
456 <Reference name="OpenSim.Physics.Manager"/>
457 <Reference name="OpenSim.Servers"/>
458 <Reference name="OpenSim.Caches"/>
459 <Reference name="XMLRPC"/>
460
461 <Files> 433 <Files>
462 <Match pattern="*.cs" recurse="true"/> 434 <Match pattern="*.cs" recurse="true"/>
463 </Files> 435 </Files>
464 </Project> 436 </Project>
465 437
466 438 <Project name="OpenGrid.Framework.Data.DB4o" path="Common/OpenGrid.Framework.Data.DB4o" type="Library">
467 <Project name="OpenSim.Region" path="OpenSim/OpenSim.Region" type="Library">
468 <Configuration name="Debug"> 439 <Configuration name="Debug">
469 <Options> 440 <Options>
470 <OutputPath>../../bin/</OutputPath> 441 <OutputPath>../../bin/</OutputPath>
471 </Options> 442 </Options>
472 </Configuration> 443 </Configuration>
444 <Configuration name="Release">
445 <Options>
446 <OutputPath>../../bin/</OutputPath>
447 </Options>
448 </Configuration>
473 449
474 <ReferencePath>../../bin/</ReferencePath> 450 <ReferencePath>../../bin/</ReferencePath>
475 <Reference name="System" localCopy="false"/> 451 <Reference name="System" localCopy="false"/>
476 <Reference name="System.Xml"/> 452 <Reference name="System.Xml"/>
453 <Reference name="System.Data"/>
454 <Reference name="OpenGrid.Framework.Data"/>
477 <Reference name="libsecondlife.dll"/> 455 <Reference name="libsecondlife.dll"/>
478 <Reference name="Axiom.MathLib.dll"/>
479 <Reference name="Db4objects.Db4o.dll"/> 456 <Reference name="Db4objects.Db4o.dll"/>
480 <Reference name="OpenSim.Terrain.BasicTerrain"/> 457 <Files>
481 <Reference name="OpenSim.Framework"/> 458 <Match pattern="*.cs" recurse="true"/>
482 <Reference name="OpenSim.Framework.Console"/> 459 </Files>
483 <Reference name="OpenSim.GenericConfig.Xml"/> 460 </Project>
484 <Reference name="OpenSim.Physics.Manager"/> 461
485 <Reference name="OpenSim.Servers"/> 462 <Project name="OpenGrid.Framework.UserManagement" path="Common/OpenGrid.Framework.UserManager" type="Library">
486 <Reference name="OpenSim.Caches"/> 463 <Configuration name="Debug">
487 <Reference name="XMLRPC"/> 464 <Options>
488 <Reference name="OpenGrid.Framework.Communications"/> 465 <OutputPath>../../bin/</OutputPath>
466 </Options>
467 </Configuration>
468 <Configuration name="Release">
469 <Options>
470 <OutputPath>../../bin/</OutputPath>
471 </Options>
472 </Configuration>
473
474 <ReferencePath>../../bin/</ReferencePath>
475 <Reference name="System" localCopy="false"/>
476 <Reference name="System.Data" localCopy="false"/>
477 <Reference name="System.Xml" localCopy="false"/>
478 <Reference name="OpenSim.Framework"/>
479 <Reference name="OpenSim.Framework.Console"/>
480 <Reference name="OpenGrid.Framework.Data"/>
481 <Reference name="OpenSim.GenericConfig.Xml"/>
482 <Reference name="OpenSim.Servers"/>
483 <Reference name="libsecondlife.dll"/>
484 <Reference name="Db4objects.Db4o.dll"/>
485 <Reference name="XMLRPC"/>
486
487 <Files>
488 <Match pattern="*.cs" recurse="true"/>
489 </Files>
490 </Project>
491
492 <!-- OpenGridFrameWork.Communications" -->
493 <Project name="OpenGrid.Framework.Communications" path="Common/OpenGrid.Framework.Communications" type="Library">
494 <Configuration name="Debug">
495 <Options>
496 <OutputPath>../../bin/</OutputPath>
497 </Options>
498 </Configuration>
499 <Configuration name="Release">
500 <Options>
501 <OutputPath>../../bin/</OutputPath>
502 </Options>
503 </Configuration>
504
505 <ReferencePath>../../bin/</ReferencePath>
506 <Reference name="System"/>
507 <Reference name="System.Xml"/>
508 <Reference name="OpenSim.Framework"/>
509 <Reference name="OpenGrid.Framework.Data" />
510 <Reference name="libsecondlife.dll"/>
489 511
490 <Files> 512 <Files>
491 <Match pattern="*.cs" recurse="true"/> 513 <Match pattern="*.cs" recurse="true"/>
492 </Files> 514 </Files>
493 </Project> 515 </Project>
494 516
495 <!-- OpenSim app --> 517 <Project name="OpenSim.LocalCommunications" path="OpenSim/OpenSim.LocalCommunications" type="Library">
496 <Project name="OpenSim" path="OpenSim/OpenSim" type="Exe">
497 <Configuration name="Debug"> 518 <Configuration name="Debug">
498 <Options> 519 <Options>
499 <OutputPath>../../bin/</OutputPath> 520 <OutputPath>../../bin/</OutputPath>
500 </Options> 521 </Options>
501 </Configuration> 522 </Configuration>
523 <Configuration name="Release">
524 <Options>
525 <OutputPath>../../bin/</OutputPath>
526 </Options>
527 </Configuration>
528
529 <ReferencePath>../../bin/</ReferencePath>
530 <Reference name="System"/>
531 <Reference name="System.Xml"/>
532 <Reference name="OpenGrid.Framework.Communications"/>
533 <Reference name="OpenGrid.Framework.UserManagement" />
534 <Reference name="OpenGrid.Framework.Data" />
535 <Reference name="libsecondlife.dll"/>
536 <Reference name="OpenSim.Framework"/>
537
538 <Files>
539 <Match pattern="*.cs" recurse="true"/>
540 </Files>
541 </Project>
542
543
544 <Project name="OpenSim.RegionServer" path="OpenSim/OpenSim.RegionServer" type="Library">
545 <Configuration name="Debug">
546 <Options>
547 <OutputPath>../../bin/</OutputPath>
548 </Options>
549 </Configuration>
550 <Configuration name="Release">
551 <Options>
552 <OutputPath>../../bin/</OutputPath>
553 </Options>
554 </Configuration>
502 555
503 <ReferencePath>../../bin/</ReferencePath> 556 <ReferencePath>../../bin/</ReferencePath>
504 <Reference name="System" localCopy="false"/> 557 <Reference name="System" localCopy="false"/>
@@ -509,81 +562,92 @@
509 <Reference name="OpenSim.Terrain.BasicTerrain"/> 562 <Reference name="OpenSim.Terrain.BasicTerrain"/>
510 <Reference name="OpenSim.Framework"/> 563 <Reference name="OpenSim.Framework"/>
511 <Reference name="OpenSim.Framework.Console"/> 564 <Reference name="OpenSim.Framework.Console"/>
565 <Reference name="OpenSim.GenericConfig.Xml"/>
512 <Reference name="OpenSim.Physics.Manager"/> 566 <Reference name="OpenSim.Physics.Manager"/>
513 <Reference name="OpenSim.Servers"/> 567 <Reference name="OpenSim.Servers"/>
514 <Reference name="OpenSim.Region"/>
515 <Reference name="OpenSim.RegionServer"/>
516 <Reference name="OpenSim.GenericConfig.Xml"/>
517 <Reference name="OpenGrid.Framework.Communications"/>
518 <Reference name="OpenSim.Caches"/> 568 <Reference name="OpenSim.Caches"/>
519 <Reference name="XMLRPC"/> 569 <Reference name="XMLRPC"/>
520 <Reference name="OpenSim.LocalCommunications"/>
521 570
522 <Files> 571 <Files>
523 <Match pattern="*.cs" recurse="true"/> 572 <Match pattern="*.cs" recurse="true"/>
524 </Files> 573 </Files>
525 </Project> 574 </Project>
526 575
527 <!-- Scene Server API Example Apps -->
528 576
529 <Project name="SimpleApp" path="OpenSim/Examples/SimpleApp" type="Exe"> 577 <Project name="OpenSim.Region" path="OpenSim/OpenSim.Region" type="Library">
530 <Configuration name="Debug"> 578 <Configuration name="Debug">
531 <Options> 579 <Options>
532 <OutputPath>../../../bin/</OutputPath> 580 <OutputPath>../../bin/</OutputPath>
581 </Options>
582 </Configuration>
583 <Configuration name="Release">
584 <Options>
585 <OutputPath>../../bin/</OutputPath>
533 </Options> 586 </Options>
534 </Configuration> 587 </Configuration>
535 588
536 <ReferencePath>../../../bin/</ReferencePath> 589 <ReferencePath>../../bin/</ReferencePath>
537
538 <Reference name="libsecondlife.dll"/>
539 <Reference name="System" localCopy="false"/> 590 <Reference name="System" localCopy="false"/>
540 <Reference name="System.Data.dll"/>
541 <Reference name="System.Xml"/> 591 <Reference name="System.Xml"/>
542 592 <Reference name="libsecondlife.dll"/>
543 <Reference name="OpenSim.Framework.Console"/> 593 <Reference name="Axiom.MathLib.dll"/>
594 <Reference name="Db4objects.Db4o.dll"/>
595 <Reference name="OpenSim.Terrain.BasicTerrain"/>
544 <Reference name="OpenSim.Framework"/> 596 <Reference name="OpenSim.Framework"/>
545 <Reference name="XMLRPC"/> 597 <Reference name="OpenSim.Framework.Console"/>
546 <Reference name="OpenSim.GridInterfaces.Local"/> 598 <Reference name="OpenSim.GenericConfig.Xml"/>
599 <Reference name="OpenSim.Physics.Manager"/>
547 <Reference name="OpenSim.Servers"/> 600 <Reference name="OpenSim.Servers"/>
548 <Reference name="OpenSim.Caches"/> 601 <Reference name="OpenSim.Caches"/>
549 <Reference name="OpenSim.RegionServer"/> 602 <Reference name="XMLRPC"/>
603 <Reference name="OpenGrid.Framework.Communications"/>
550 604
551 <Files> 605 <Files>
552 <Match pattern="*.cs" recurse="true"/> 606 <Match pattern="*.cs" recurse="true"/>
553 </Files> 607 </Files>
554 </Project> 608 </Project>
555 609
556 <Project name="SimpleApp2" path="OpenSim/Examples/SimpleApp2" type="Exe"> 610 <!-- OpenSim app -->
611 <Project name="OpenSim" path="OpenSim/OpenSim" type="Exe">
557 <Configuration name="Debug"> 612 <Configuration name="Debug">
558 <Options> 613 <Options>
559 <OutputPath>../../../bin/</OutputPath> 614 <OutputPath>../../bin/</OutputPath>
615 </Options>
616 </Configuration>
617 <Configuration name="Release">
618 <Options>
619 <OutputPath>../../bin/</OutputPath>
560 </Options> 620 </Options>
561 </Configuration> 621 </Configuration>
562 622
563 <ReferencePath>../../../bin/</ReferencePath> 623 <ReferencePath>../../bin/</ReferencePath>
564
565 <Reference name="libsecondlife.dll"/>
566 <Reference name="System" localCopy="false"/> 624 <Reference name="System" localCopy="false"/>
567 <Reference name="System.Data.dll"/>
568 <Reference name="System.Xml"/> 625 <Reference name="System.Xml"/>
569 626 <Reference name="libsecondlife.dll"/>
570 <Reference name="OpenSim.Framework.Console"/> 627 <Reference name="Axiom.MathLib.dll"/>
628 <Reference name="Db4objects.Db4o.dll"/>
629 <Reference name="OpenSim.Terrain.BasicTerrain"/>
571 <Reference name="OpenSim.Framework"/> 630 <Reference name="OpenSim.Framework"/>
572 <Reference name="XMLRPC"/> 631 <Reference name="OpenSim.Framework.Console"/>
573 <Reference name="OpenSim.GridInterfaces.Local"/> 632 <Reference name="OpenSim.Physics.Manager"/>
574 <Reference name="OpenSim.Servers"/> 633 <Reference name="OpenSim.Servers"/>
575 <Reference name="OpenSim.Caches"/> 634 <Reference name="OpenSim.Region"/>
576 <Reference name="OpenSim.RegionServer"/> 635 <Reference name="OpenSim.RegionServer"/>
636 <Reference name="OpenSim.GenericConfig.Xml"/>
637 <Reference name="OpenGrid.Framework.Communications"/>
638 <Reference name="OpenSim.Caches"/>
639 <Reference name="XMLRPC"/>
640 <Reference name="OpenSim.LocalCommunications"/>
577 641
578 <Files> 642 <Files>
579 <Match pattern="*.cs" recurse="true"/> 643 <Match pattern="*.cs" recurse="true"/>
580 </Files> 644 </Files>
581 </Project> 645 </Project>
582 646
583 </Solution> 647</Solution>
584 648
585 649
586 <Solution name="OpenGridServices" activeConfig="Debug" path="./"> 650<Solution name="OpenGridServices" activeConfig="Debug" path="./">
587 <Configuration name="Debug"> 651 <Configuration name="Debug">
588 <Options> 652 <Options>
589 <CompilerDefines>TRACE;DEBUG</CompilerDefines> 653 <CompilerDefines>TRACE;DEBUG</CompilerDefines>
@@ -615,9 +679,9 @@
615 </Options> 679 </Options>
616 </Configuration> 680 </Configuration>
617 681
618 682
619 <!-- OpenGrid Data Services --> 683 <!-- OpenGrid Data Services -->
620 <Project name="OpenGrid.Framework.Data" path="OpenGridServices/OpenGrid.Framework.Data" type="Library"> 684 <Project name="OpenGrid.Framework.Data" path="Common/OpenGrid.Framework.Data" type="Library">
621 <Configuration name="Debug"> 685 <Configuration name="Debug">
622 <Options> 686 <Options>
623 <OutputPath>../../bin/</OutputPath> 687 <OutputPath>../../bin/</OutputPath>
@@ -663,7 +727,7 @@
663 </Files> 727 </Files>
664 </Project> 728 </Project>
665 729
666 <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGridServices/OpenGrid.Framework.Data.DB4o" type="Library"> 730 <Project name="OpenGrid.Framework.Data.DB4o" path="Common/OpenGrid.Framework.Data.DB4o" type="Library">
667 <Configuration name="Debug"> 731 <Configuration name="Debug">
668 <Options> 732 <Options>
669 <OutputPath>../../bin/</OutputPath> 733 <OutputPath>../../bin/</OutputPath>
@@ -734,9 +798,9 @@
734 </Files> 798 </Files>
735 </Project> 799 </Project>
736 800
737 <!-- OGS projects --> 801 <!-- OGS projects -->
738 802
739 <Project name="OpenGrid.Framework.Manager" path="OpenGridServices/OpenGrid.Framework.Manager" type="Library"> 803 <Project name="OpenGrid.Framework.Manager" path="OpenGridServices/OpenGrid.Framework.Manager" type="Library">
740 <Configuration name="Debug"> 804 <Configuration name="Debug">
741 <Options> 805 <Options>
742 <OutputPath>../../bin/</OutputPath> 806 <OutputPath>../../bin/</OutputPath>
@@ -748,19 +812,19 @@
748 </Options> 812 </Options>
749 </Configuration> 813 </Configuration>
750 814
751 <ReferencePath>../../bin/</ReferencePath> 815 <ReferencePath>../../bin/</ReferencePath>
752 <Reference name="System" localCopy="false"/> 816 <Reference name="System" localCopy="false"/>
753 <Reference name="OpenSim.Framework"/> 817 <Reference name="OpenSim.Framework"/>
754 <Reference name="OpenSim.Servers"/> 818 <Reference name="OpenSim.Servers"/>
755 <Reference name="libsecondlife.dll"/> 819 <Reference name="libsecondlife.dll"/>
756 <Reference name="XMLRPC"/> 820 <Reference name="XMLRPC"/>
757 821
758 822
759 <Files> 823 <Files>
760 <Match pattern="*.cs" recurse="true"/> 824 <Match pattern="*.cs" recurse="true"/>
761 </Files> 825 </Files>
762 </Project> 826 </Project>
763 827
764 <Project name="OpenGridServices.GridServer" path="OpenGridServices/OpenGridServices.GridServer" type="Exe"> 828 <Project name="OpenGridServices.GridServer" path="OpenGridServices/OpenGridServices.GridServer" type="Exe">
765 <Configuration name="Debug"> 829 <Configuration name="Debug">
766 <Options> 830 <Options>
@@ -773,26 +837,26 @@
773 </Options> 837 </Options>
774 </Configuration> 838 </Configuration>
775 839
776 <ReferencePath>../../bin/</ReferencePath> 840 <ReferencePath>../../bin/</ReferencePath>
777 <Reference name="System" localCopy="false"/> 841 <Reference name="System" localCopy="false"/>
778 <Reference name="System.Data" localCopy="false"/> 842 <Reference name="System.Data" localCopy="false"/>
779 <Reference name="System.Xml" localCopy="false"/> 843 <Reference name="System.Xml" localCopy="false"/>
780 <Reference name="OpenSim.Framework"/> 844 <Reference name="OpenSim.Framework"/>
781 <Reference name="OpenSim.Framework.Console"/> 845 <Reference name="OpenSim.Framework.Console"/>
782 <Reference name="OpenSim.Servers"/> 846 <Reference name="OpenSim.Servers"/>
783 <Reference name="OpenGrid.Framework.Data"/> 847 <Reference name="OpenGrid.Framework.Data"/>
784 <Reference name="OpenGrid.Framework.Manager"/> 848 <Reference name="OpenGrid.Framework.Manager"/>
785 <Reference name="OpenSim.GenericConfig.Xml"/> 849 <Reference name="OpenSim.GenericConfig.Xml"/>
786 <Reference name="libsecondlife.dll"/> 850 <Reference name="libsecondlife.dll"/>
787 <Reference name="Db4objects.Db4o.dll"/> 851 <Reference name="Db4objects.Db4o.dll"/>
788 <Reference name="XMLRPC"/> 852 <Reference name="XMLRPC"/>
789 853
790 <Files> 854 <Files>
791 <Match pattern="*.cs" recurse="true"/> 855 <Match pattern="*.cs" recurse="true"/>
792 </Files> 856 </Files>
793 </Project> 857 </Project>
794 858
795 <Project name="OpenGridServices.AssetServer" path="OpenGridServices/OpenGridServices.AssetServer" type="Exe"> 859 <Project name="OpenGridServices.AssetServer" path="OpenGridServices/OpenGridServices.AssetServer" type="Exe">
796 <Configuration name="Debug"> 860 <Configuration name="Debug">
797 <Options> 861 <Options>
798 <OutputPath>../../bin/</OutputPath> 862 <OutputPath>../../bin/</OutputPath>
@@ -804,20 +868,50 @@
804 </Options> 868 </Options>
805 </Configuration> 869 </Configuration>
806 870
807 <ReferencePath>../../bin/</ReferencePath> 871 <ReferencePath>../../bin/</ReferencePath>
808 <Reference name="System" localCopy="false"/> 872 <Reference name="System" localCopy="false"/>
809 <Reference name="System.Data" localCopy="false"/> 873 <Reference name="System.Data" localCopy="false"/>
810 <Reference name="System.Xml" localCopy="false"/> 874 <Reference name="System.Xml" localCopy="false"/>
811 <Reference name="OpenSim.Framework"/> 875 <Reference name="OpenSim.Framework"/>
812 <Reference name="OpenSim.Framework.Console"/> 876 <Reference name="OpenSim.Framework.Console"/>
813 <Reference name="OpenSim.Servers"/> 877 <Reference name="OpenSim.Servers"/>
814 <Reference name="libsecondlife.dll"/> 878 <Reference name="libsecondlife.dll"/>
815 <Reference name="Db4objects.Db4o.dll"/> 879 <Reference name="Db4objects.Db4o.dll"/>
816 <Reference name="XMLRPC"/> 880 <Reference name="XMLRPC"/>
881
882 <Files>
883 <Match pattern="*.cs" recurse="true"/>
884 </Files>
885 </Project>
817 886
818 <Files> 887 <Project name="OpenGrid.Framework.UserManagement" path="Common/OpenGrid.Framework.UserManager" type="Library">
819 <Match pattern="*.cs" recurse="true"/> 888 <Configuration name="Debug">
820 </Files> 889 <Options>
890 <OutputPath>../../bin/</OutputPath>
891 </Options>
892 </Configuration>
893 <Configuration name="Release">
894 <Options>
895 <OutputPath>../../bin/</OutputPath>
896 </Options>
897 </Configuration>
898
899 <ReferencePath>../../bin/</ReferencePath>
900 <Reference name="System" localCopy="false"/>
901 <Reference name="System.Data" localCopy="false"/>
902 <Reference name="System.Xml" localCopy="false"/>
903 <Reference name="OpenSim.Framework"/>
904 <Reference name="OpenSim.Framework.Console"/>
905 <Reference name="OpenGrid.Framework.Data"/>
906 <Reference name="OpenSim.GenericConfig.Xml"/>
907 <Reference name="OpenSim.Servers"/>
908 <Reference name="libsecondlife.dll"/>
909 <Reference name="Db4objects.Db4o.dll"/>
910 <Reference name="XMLRPC"/>
911
912 <Files>
913 <Match pattern="*.cs" recurse="true"/>
914 </Files>
821 </Project> 915 </Project>
822 916
823 <Project name="OpenGridServices.UserServer" path="OpenGridServices/OpenGridServices.UserServer" type="Exe"> 917 <Project name="OpenGridServices.UserServer" path="OpenGridServices/OpenGridServices.UserServer" type="Exe">
@@ -831,25 +925,27 @@
831 <OutputPath>../../bin/</OutputPath> 925 <OutputPath>../../bin/</OutputPath>
832 </Options> 926 </Options>
833 </Configuration> 927 </Configuration>
834 928
835 <ReferencePath>../../bin/</ReferencePath> 929 <ReferencePath>../../bin/</ReferencePath>
836 <Reference name="System" localCopy="false"/> 930 <Reference name="System" localCopy="false"/>
837 <Reference name="System.Data" localCopy="false"/> 931 <Reference name="System.Data" localCopy="false"/>
838 <Reference name="System.Xml" localCopy="false"/> 932 <Reference name="System.Xml" localCopy="false"/>
839 <Reference name="OpenSim.Framework"/> 933 <Reference name="OpenSim.Framework"/>
840 <Reference name="OpenSim.Framework.Console"/> 934 <Reference name="OpenSim.Framework.Console"/>
841 <Reference name="OpenGrid.Framework.Data"/> 935 <Reference name="OpenGrid.Framework.Data"/>
842 <Reference name="OpenSim.GenericConfig.Xml"/> 936 <Reference name="OpenSim.GenericConfig.Xml"/>
843 <Reference name="OpenSim.Servers"/> 937 <Reference name="OpenSim.Servers"/>
844 <Reference name="libsecondlife.dll"/> 938 <Reference name="OpenGrid.Framework.UserManager" />
845 <Reference name="Db4objects.Db4o.dll"/> 939 <Reference name="libsecondlife.dll"/>
846 <Reference name="XMLRPC"/> 940 <Reference name="Db4objects.Db4o.dll"/>
847 941 <Reference name="XMLRPC"/>
848 <Files> 942
849 <Match pattern="*.cs" recurse="true"/> 943 <Files>
850 </Files> 944 <Match pattern="*.cs" recurse="true"/>
945 </Files>
851 </Project> 946 </Project>
852 947
948
853 949
854 950
855 <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGridServices/OpenGrid.Config/GridConfigDb4o" type="Library"> 951 <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGridServices/OpenGrid.Config/GridConfigDb4o" type="Library">
@@ -883,6 +979,11 @@
883 <OutputPath>../../../bin/</OutputPath> 979 <OutputPath>../../../bin/</OutputPath>
884 </Options> 980 </Options>
885 </Configuration> 981 </Configuration>
982 <Configuration name="Release">
983 <Options>
984 <OutputPath>../../../bin/</OutputPath>
985 </Options>
986 </Configuration>
886 987
887 <ReferencePath>../../../bin/</ReferencePath> 988 <ReferencePath>../../../bin/</ReferencePath>
888 <Reference name="System" localCopy="false"/> 989 <Reference name="System" localCopy="false"/>
@@ -896,9 +997,10 @@
896 <Match pattern="*.cs" recurse="true"/> 997 <Match pattern="*.cs" recurse="true"/>
897 </Files> 998 </Files>
898 </Project> 999 </Project>
899 </Solution> 1000
900 1001</Solution>
901 1002
1003
902 <!-- Prebuild tool --> 1004 <!-- Prebuild tool -->
903 <Solution name="Prebuild" path="Prebuild/" > 1005 <Solution name="Prebuild" path="Prebuild/" >
904 <Configuration name="Debug"> 1006 <Configuration name="Debug">
@@ -910,6 +1012,15 @@
910 <SuppressWarnings>1595</SuppressWarnings> 1012 <SuppressWarnings>1595</SuppressWarnings>
911 </Options> 1013 </Options>
912 </Configuration> 1014 </Configuration>
1015 <Configuration name="Release">
1016 <Options>
1017 <CompilerDefines>TRACE</CompilerDefines>
1018 <OutputPath>bin/Release</OutputPath>
1019 <OptimizeCode>true</OptimizeCode>
1020 <DebugInformation>false</DebugInformation>
1021 <SuppressWarnings>1595</SuppressWarnings>
1022 </Options>
1023 </Configuration>
913 <Project name="Prebuild" path="src/" language="C#" assemblyName="Prebuild" icon="App.ico" type="Exe" rootNamespace="Prebuild" startupObject="Prebuild.Prebuild"> 1024 <Project name="Prebuild" path="src/" language="C#" assemblyName="Prebuild" icon="App.ico" type="Exe" rootNamespace="Prebuild" startupObject="Prebuild.Prebuild">
914 <Configuration name="Debug"> 1025 <Configuration name="Debug">
915 <Options> 1026 <Options>
@@ -921,6 +1032,16 @@
921 <SuppressWarnings>1595</SuppressWarnings> 1032 <SuppressWarnings>1595</SuppressWarnings>
922 </Options> 1033 </Options>
923 </Configuration> 1034 </Configuration>
1035 <Configuration name="Release">
1036 <Options>
1037 <CompilerDefines>TRACE</CompilerDefines>
1038 <OutputPath>..\..\bin\</OutputPath>
1039 <OptimizeCode>true</OptimizeCode>
1040 <DebugInformation>false</DebugInformation>
1041 <KeyFile>Prebuild.snk</KeyFile>
1042 <SuppressWarnings>1595</SuppressWarnings>
1043 </Options>
1044 </Configuration>
924 <ReferencePath>../../bin/</ReferencePath> 1045 <ReferencePath>../../bin/</ReferencePath>
925 <Reference name="System.EnterpriseServices" /> 1046 <Reference name="System.EnterpriseServices" />
926 <Reference name="System.Xml" /> 1047 <Reference name="System.Xml" />