diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 10 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj | 4 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 5c27d57..c0ff649 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -38,18 +38,18 @@ using OpenSim.Framework.Sims; | |||
38 | using OpenSim.Framework.Inventory; | 38 | using OpenSim.Framework.Inventory; |
39 | using OpenSim.Framework.Interfaces; | 39 | using OpenSim.Framework.Interfaces; |
40 | using OpenSim.Framework.Console; | 40 | using OpenSim.Framework.Console; |
41 | using OpenSim.Servers; | 41 | using OpenSim.Framework.Servers; |
42 | using OpenSim.Framework.Utilities; | 42 | using OpenSim.Framework.Utilities; |
43 | using OpenSim.GenericConfig; | 43 | using OpenSim.GenericConfig; |
44 | 44 | ||
45 | namespace OpenGridServices.UserServer | 45 | namespace OpenSim.Grid.UserServer |
46 | { | 46 | { |
47 | /// <summary> | 47 | /// <summary> |
48 | /// </summary> | 48 | /// </summary> |
49 | public class OpenUser_Main : conscmd_callback | 49 | public class OpenUser_Main : conscmd_callback |
50 | { | 50 | { |
51 | private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll"; | 51 | private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll"; |
52 | private string StorageDll = "OpenGrid.Framework.Data.MySQL.dll"; | 52 | private string StorageDll = "OpenSim.Framework.Data.MySQL.dll"; |
53 | private UserConfig Cfg; | 53 | private UserConfig Cfg; |
54 | protected IGenericConfig localXMLConfig; | 54 | protected IGenericConfig localXMLConfig; |
55 | 55 | ||
@@ -169,8 +169,8 @@ namespace OpenGridServices.UserServer | |||
169 | attri = configData.GetAttribute("DataBaseProvider"); | 169 | attri = configData.GetAttribute("DataBaseProvider"); |
170 | if (attri == "") | 170 | if (attri == "") |
171 | { | 171 | { |
172 | StorageDll = "OpenGrid.Framework.Data.DB4o.dll"; | 172 | StorageDll = "OpenSim.Framework.Data.DB4o.dll"; |
173 | configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll"); | 173 | configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); |
174 | } | 174 | } |
175 | else | 175 | else |
176 | { | 176 | { |
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj index 3c93b78..e5cb92c 100644 --- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj +++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj | |||
@@ -112,10 +112,10 @@ | |||
112 | </ProjectReference> | 112 | </ProjectReference> |
113 | </ItemGroup> | 113 | </ItemGroup> |
114 | <ItemGroup> | 114 | <ItemGroup> |
115 | <Compile Include="Main.cs"> | 115 | <Compile Include="UserManager.cs"> |
116 | <SubType>Code</SubType> | 116 | <SubType>Code</SubType> |
117 | </Compile> | 117 | </Compile> |
118 | <Compile Include="UserManager.cs"> | 118 | <Compile Include="Main.cs"> |
119 | <SubType>Code</SubType> | 119 | <SubType>Code</SubType> |
120 | </Compile> | 120 | </Compile> |
121 | <Compile Include="Properties\AssemblyInfo.cs"> | 121 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 0704de1..c99cf87 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | using OpenGrid.Framework.Data; | 32 | using OpenSim.Framework.Data; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using System.Reflection; | 34 | using System.Reflection; |
35 | 35 | ||
@@ -38,11 +38,12 @@ using Nwc.XmlRpc; | |||
38 | using OpenSim.Framework.Sims; | 38 | using OpenSim.Framework.Sims; |
39 | using OpenSim.Framework.Inventory; | 39 | using OpenSim.Framework.Inventory; |
40 | using OpenSim.Framework.Utilities; | 40 | using OpenSim.Framework.Utilities; |
41 | using OpenGrid.Framework.UserManagement; | 41 | |
42 | using OpenSim.Framework.UserManagement; | ||
42 | 43 | ||
43 | using System.Security.Cryptography; | 44 | using System.Security.Cryptography; |
44 | 45 | ||
45 | namespace OpenGridServices.UserServer | 46 | namespace OpenSim.Grid.UserServer |
46 | { | 47 | { |
47 | public class UserManager : UserManagerBase | 48 | public class UserManager : UserManagerBase |
48 | { | 49 | { |