diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs (renamed from OpenGridServices/OpenGridServices.UserServer/Main.cs) | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 5c27d57..640f91a 100644 --- a/OpenGridServices/OpenGridServices.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 = "OpenSim.Grid.UserServer.Config.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 | ||
@@ -107,8 +107,8 @@ namespace OpenGridServices.UserServer | |||
107 | 107 | ||
108 | httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); | 108 | httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); |
109 | 109 | ||
110 | httpServer.AddRestHandler("GET", "/user/name/", m_userManager.RestGetUserMethodName); | 110 | httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName); |
111 | httpServer.AddRestHandler("GET", "/user/uuid/", m_userManager.RestGetUserMethodUUID); | 111 | httpServer.AddXmlRPCHandler("get_user_by_uuid", m_userManager.XmlRPCGetUserMethodUUID); |
112 | 112 | ||
113 | httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod); | 113 | httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod); |
114 | 114 | ||
@@ -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 | { |