diff options
author | Jeff Ames | 2009-10-01 01:00:09 +0900 |
---|---|---|
committer | Jeff Ames | 2009-10-01 01:17:47 +0900 |
commit | ee205e7e812e170f670e690a4e0fa9caa652f226 (patch) | |
tree | df407e66d9aa47a884e39d5d86b877d6ef468a1a /OpenSim/Grid | |
parent | adding LandDataSerializer (not connected anywhere, work-in-progress) (diff) | |
download | opensim-SC_OLD-ee205e7e812e170f670e690a4e0fa9caa652f226.zip opensim-SC_OLD-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.gz opensim-SC_OLD-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.bz2 opensim-SC_OLD-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Grid')
6 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs index 8006119..76c4899 100644 --- a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs +++ b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs | |||
@@ -70,6 +70,6 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
70 | { | 70 | { |
71 | //throw new Exception("The method or operation is not implemented."); | 71 | //throw new Exception("The method or operation is not implemented."); |
72 | return null; | 72 | return null; |
73 | } | 73 | } |
74 | } | 74 | } |
75 | } | 75 | } |
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs index 9d31d81..77caf47 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
47 | 47 | ||
48 | /// <summary> | 48 | /// <summary> |
49 | /// Hypergrid login service used in grid mode. | 49 | /// Hypergrid login service used in grid mode. |
50 | /// </summary> | 50 | /// </summary> |
51 | public class UserLoginAuthService : HGLoginAuthService | 51 | public class UserLoginAuthService : HGLoginAuthService |
52 | { | 52 | { |
53 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 53 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs index c95e054..7d0e0de 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
55 | 55 | ||
56 | /// <summary> | 56 | /// <summary> |
57 | /// Login service used in grid mode. | 57 | /// Login service used in grid mode. |
58 | /// </summary> | 58 | /// </summary> |
59 | public class UserLoginService : LoginService | 59 | public class UserLoginService : LoginService |
60 | { | 60 | { |
61 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 61 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs index efbf45e..36c6297 100644 --- a/OpenSim/Grid/UserServer.Modules/UserManager.cs +++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs | |||
@@ -229,7 +229,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
229 | 229 | ||
230 | UserProfileData userProfile = m_userDataBaseService.GetUserProfile(userUuid); | 230 | UserProfileData userProfile = m_userDataBaseService.GetUserProfile(userUuid); |
231 | if (null == userProfile) | 231 | if (null == userProfile) |
232 | return Util.CreateUnknownUserErrorResponse(); | 232 | return Util.CreateUnknownUserErrorResponse(); |
233 | 233 | ||
234 | string authed; | 234 | string authed; |
235 | 235 | ||
@@ -249,12 +249,12 @@ namespace OpenSim.Grid.UserServer.Modules | |||
249 | // "[USER MANAGER]: Authentication by password result from {0} for {1} is {2}", | 249 | // "[USER MANAGER]: Authentication by password result from {0} for {1} is {2}", |
250 | // remoteClient, userUuid, authed); | 250 | // remoteClient, userUuid, authed); |
251 | 251 | ||
252 | XmlRpcResponse response = new XmlRpcResponse(); | 252 | XmlRpcResponse response = new XmlRpcResponse(); |
253 | Hashtable responseData = new Hashtable(); | 253 | Hashtable responseData = new Hashtable(); |
254 | responseData["auth_user"] = authed; | 254 | responseData["auth_user"] = authed; |
255 | response.Value = responseData; | 255 | response.Value = responseData; |
256 | 256 | ||
257 | return response; | 257 | return response; |
258 | } | 258 | } |
259 | 259 | ||
260 | public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request, IPEndPoint remoteClient) | 260 | public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request, IPEndPoint remoteClient) |
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index a92226d..286076d7 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -187,13 +187,13 @@ namespace OpenSim.Grid.UserServer | |||
187 | /// <param name="inventoryService"></param> | 187 | /// <param name="inventoryService"></param> |
188 | protected virtual void StartupUserServerModules() | 188 | protected virtual void StartupUserServerModules() |
189 | { | 189 | { |
190 | m_log.Info("[STARTUP]: Establishing data connection"); | 190 | m_log.Info("[STARTUP]: Establishing data connection"); |
191 | 191 | ||
192 | //we only need core components so we can request them from here | 192 | //we only need core components so we can request them from here |
193 | IInterServiceInventoryServices inventoryService; | 193 | IInterServiceInventoryServices inventoryService; |
194 | TryGet<IInterServiceInventoryServices>(out inventoryService); | 194 | TryGet<IInterServiceInventoryServices>(out inventoryService); |
195 | 195 | ||
196 | CommunicationsManager commsManager = new UserServerCommsManager(inventoryService); | 196 | CommunicationsManager commsManager = new UserServerCommsManager(inventoryService); |
197 | 197 | ||
198 | //setup database access service, for now this has to be created before the other modules. | 198 | //setup database access service, for now this has to be created before the other modules. |
199 | m_userDataBaseService = new UserDataBaseService(commsManager); | 199 | m_userDataBaseService = new UserDataBaseService(commsManager); |
diff --git a/OpenSim/Grid/UserServer/UserServerCommsManager.cs b/OpenSim/Grid/UserServer/UserServerCommsManager.cs index 7200836..8ef693b 100644 --- a/OpenSim/Grid/UserServer/UserServerCommsManager.cs +++ b/OpenSim/Grid/UserServer/UserServerCommsManager.cs | |||
@@ -28,9 +28,9 @@ | |||
28 | using OpenSim.Framework.Communications; | 28 | using OpenSim.Framework.Communications; |
29 | 29 | ||
30 | namespace OpenSim.Grid.UserServer | 30 | namespace OpenSim.Grid.UserServer |
31 | { | 31 | { |
32 | public class UserServerCommsManager : CommunicationsManager | 32 | public class UserServerCommsManager : CommunicationsManager |
33 | { | 33 | { |
34 | public UserServerCommsManager(IInterServiceInventoryServices interServiceInventoryService) | 34 | public UserServerCommsManager(IInterServiceInventoryServices interServiceInventoryService) |
35 | : base(null, null) | 35 | : base(null, null) |
36 | { | 36 | { |