*Fixed OpenGridServices.sln and prebuild.xml

*NameSpaceChanges branch now fully compiles!
author: mingchen 2007-06-27 18:28:45 +0000
committer: mingchen 2007-06-27 18:28:45 +0000
commit: 1a6f58f3378e28199056577e58c5177f23515138 (patch)
tree: 21293712585d65fdb65af424f4515f90b8cdd7cb
parent: *Fixed all renaming for OpenGridServices.sln, still a reference issue in preb... (diff)
download: opensim-SC_OLD-1a6f58f3378e28199056577e58c5177f23515138.zip
opensim-SC_OLD-1a6f58f3378e28199056577e58c5177f23515138.tar.gz
opensim-SC_OLD-1a6f58f3378e28199056577e58c5177f23515138.tar.bz2
opensim-SC_OLD-1a6f58f3378e28199056577e58c5177f23515138.tar.xz
3 files changed, 65 insertions, 73 deletions
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 2a6079e..5f47b6b 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C# Express 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,71 +25,61 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
 EndProject
 Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
+                Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
+                Release|Any CPU = Release|Any CPU
-  EndGlobalSection
+        EndGlobalSection
-  GlobalSection(ProjectDependencies) = postSolution
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-  EndGlobalSection
+                {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        EndGlobalSection
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+        GlobalSection(SolutionProperties) = preSolution
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                HideSolutionNode = FALSE
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        EndGlobalSection
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(SolutionProperties) = preSolution
-    HideSolutionNode = FALSE
-  EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index e5cb92c..e822c18 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -82,10 +82,6 @@
      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.Framework.UserManager" >
-      <HintPath>OpenSim.Framework.UserManager.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="System" >
      <HintPath>System.dll</HintPath>
      <Private>False</Private>
@@ -110,6 +106,12 @@
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
+      <Name>OpenSim.Framework.UserManagement</Name>
+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+                        <Private>False</Private>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="UserManager.cs">
diff --git a/prebuild.xml b/prebuild.xml
index 6638d40..dacaa0a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -985,7 +985,7 @@
     <Reference name="OpenSim.Framework.Data"/>
     <Reference name="OpenSim.Framework.GenericConfig.Xml"/>
     <Reference name="OpenSim.Framework.Servers"/>
-     <Reference name="OpenSim.Framework.UserManager" />
+     <Reference name="OpenSim.Framework.UserManagement" />
     <Reference name="libsecondlife.dll"/>
     <Reference name="Db4objects.Db4o.dll"/>
     <Reference name="XMLRPC.dll"/>
author	mingchen	2007-06-27 18:28:45 +0000
committer	mingchen	2007-06-27 18:28:45 +0000
commit	1a6f58f3378e28199056577e58c5177f23515138 (patch)
tree	21293712585d65fdb65af424f4515f90b8cdd7cb
parent	*Fixed all renaming for OpenGridServices.sln, still a reference issue in preb... (diff)
download	opensim-SC_OLD-1a6f58f3378e28199056577e58c5177f23515138.zip opensim-SC_OLD-1a6f58f3378e28199056577e58c5177f23515138.tar.gz opensim-SC_OLD-1a6f58f3378e28199056577e58c5177f23515138.tar.bz2 opensim-SC_OLD-1a6f58f3378e28199056577e58c5177f23515138.tar.xz

diff --git a/OpenGridServices.sln b/OpenGridServices.sln index 2a6079e..5f47b6b 100644 --- a/OpenGridServices.sln +++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
1	Microsoft Visual Studio Solution File, Format Version 9.00	1	Microsoft Visual Studio Solution File, Format Version 9.00
2	# Visual Studio 2005	2	# Visual C# Express 2005
3	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"	3	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
4	EndProject	4	EndProject
5	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"	5	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,71 +25,61 @@ EndProject
25	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"	25	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
26	EndProject	26	EndProject
27	Global	27	Global
28	GlobalSection(SolutionConfigurationPlatforms) = preSolution	28	GlobalSection(SolutionConfigurationPlatforms) = preSolution
29	Debug\|Any CPU = Debug\|Any CPU	29	Debug\|Any CPU = Debug\|Any CPU
30	Release\|Any CPU = Release\|Any CPU	30	Release\|Any CPU = Release\|Any CPU
31	EndGlobalSection	31	EndGlobalSection
32	GlobalSection(ProjectDependencies) = postSolution	32	GlobalSection(ProjectConfigurationPlatforms) = postSolution
33	({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})	33	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
34	({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})	34	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
35	({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})	35	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
36	({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})	36	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
37	({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	37	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
38	({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	38	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
39	({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})	39	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
40	({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	40	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
41	EndGlobalSection	41	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
42	GlobalSection(ProjectConfigurationPlatforms) = postSolution	42	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
43	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	43	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
44	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	44	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
45	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	45	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
46	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	46	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
47	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	47	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
48	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	48	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
49	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	49	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
50	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	50	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
51	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	51	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
52	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	52	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
53	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	53	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
54	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	54	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
55	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	55	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
56	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	56	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
57	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	57	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
58	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	58	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
59	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	59	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
60	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	60	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
61	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	61	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
62	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	62	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
63	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	63	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
64	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	64	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
65	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	65	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
66	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	66	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
67	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	67	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
68	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	68	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
69	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	69	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
70	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	70	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
71	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	71	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
72	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	72	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
73	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	73	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
74	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	74	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
75	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	75	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
76	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	76	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
77	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	77	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
78	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	78	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
79	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	79	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
80	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	80	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
81	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	81	EndGlobalSection
82	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	82	GlobalSection(SolutionProperties) = preSolution
83	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	83	HideSolutionNode = FALSE
84	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	84	EndGlobalSection
85	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
86	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
87	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
88	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
89	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
90	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
91	EndGlobalSection
92	GlobalSection(SolutionProperties) = preSolution
93	HideSolutionNode = FALSE
94	EndGlobalSection
95	EndGlobal	85	EndGlobal


diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj index e5cb92c..e822c18 100644 --- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj +++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -82,10 +82,6 @@
82	<HintPath>OpenSim.Framework.Servers.dll</HintPath>	82	<HintPath>OpenSim.Framework.Servers.dll</HintPath>
83	<Private>False</Private>	83	<Private>False</Private>
84	</Reference>	84	</Reference>
85	<Reference Include="OpenSim.Framework.UserManager" >
86	<HintPath>OpenSim.Framework.UserManager.dll</HintPath>
87	<Private>False</Private>
88	</Reference>
89	<Reference Include="System" >	85	<Reference Include="System" >
90	<HintPath>System.dll</HintPath>	86	<HintPath>System.dll</HintPath>
91	<Private>False</Private>	87	<Private>False</Private>
@@ -110,6 +106,12 @@
110	<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>	106	<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
111	<Private>False</Private>	107	<Private>False</Private>
112	</ProjectReference>	108	</ProjectReference>
		109	<ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
		110	<Name>OpenSim.Framework.UserManagement</Name>
		111	<Project>{586E2916-0000-0000-0000-000000000000}</Project>
		112	<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
		113	<Private>False</Private>
		114	</ProjectReference>
113	</ItemGroup>	115	</ItemGroup>
114	<ItemGroup>	116	<ItemGroup>
115	<Compile Include="UserManager.cs">	117	<Compile Include="UserManager.cs">


diff --git a/prebuild.xml b/prebuild.xml index 6638d40..dacaa0a 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -985,7 +985,7 @@
985	<Reference name="OpenSim.Framework.Data"/>	985	<Reference name="OpenSim.Framework.Data"/>
986	<Reference name="OpenSim.Framework.GenericConfig.Xml"/>	986	<Reference name="OpenSim.Framework.GenericConfig.Xml"/>
987	<Reference name="OpenSim.Framework.Servers"/>	987	<Reference name="OpenSim.Framework.Servers"/>
988	<Reference name="OpenSim.Framework.UserManager" />	988	<Reference name="OpenSim.Framework.UserManagement" />
989	<Reference name="libsecondlife.dll"/>	989	<Reference name="libsecondlife.dll"/>
990	<Reference name="Db4objects.Db4o.dll"/>	990	<Reference name="Db4objects.Db4o.dll"/>
991	<Reference name="XMLRPC.dll"/>	991	<Reference name="XMLRPC.dll"/>