diff options
author | Jeff Ames | 2010-09-12 13:43:49 -0400 |
---|---|---|
committer | Jeff Ames | 2010-09-12 13:43:49 -0400 |
commit | f1f0bc23f4501ba99035283d3407ddad2b21b785 (patch) | |
tree | 2b62a244eddf18f5608405abcefa9f763ab54340 /OpenSim/Services | |
parent | Add copyright headers. (diff) | |
download | opensim-SC-f1f0bc23f4501ba99035283d3407ddad2b21b785.zip opensim-SC-f1f0bc23f4501ba99035283d3407ddad2b21b785.tar.gz opensim-SC-f1f0bc23f4501ba99035283d3407ddad2b21b785.tar.bz2 opensim-SC-f1f0bc23f4501ba99035283d3407ddad2b21b785.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
5 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index f5b5982..479a80e 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
86 | paramList.Add(hash); | 86 | paramList.Add(hash); |
87 | 87 | ||
88 | XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); | 88 | XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); |
89 | string uri = "http://" + ((info.ServerURI != null && info.ServerURI != string.Empty && !info.ServerURI.StartsWith("http:")) ? info.ServerURI : info.ExternalEndPoint.Address + ":" + info.HttpPort + "/" ); | 89 | string uri = "http://" + ((info.ServerURI != null && info.ServerURI != string.Empty && !info.ServerURI.StartsWith("http:")) ? info.ServerURI : info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"); |
90 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri); | 90 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri); |
91 | XmlRpcResponse response = null; | 91 | XmlRpcResponse response = null; |
92 | try | 92 | try |
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs index e25e7eb..403ee15 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | |||
@@ -526,7 +526,7 @@ namespace OpenSim.Services.Connectors | |||
526 | InventoryFolderBase folder = new InventoryFolderBase(); | 526 | InventoryFolderBase folder = new InventoryFolderBase(); |
527 | 527 | ||
528 | try | 528 | try |
529 | { | 529 | { |
530 | folder.ParentID = new UUID(data["ParentID"].ToString()); | 530 | folder.ParentID = new UUID(data["ParentID"].ToString()); |
531 | folder.Type = short.Parse(data["Type"].ToString()); | 531 | folder.Type = short.Parse(data["Type"].ToString()); |
532 | folder.Version = ushort.Parse(data["Version"].ToString()); | 532 | folder.Version = ushort.Parse(data["Version"].ToString()); |
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs index 86bca79..e543337 100644 --- a/OpenSim/Services/InventoryService/InventoryService.cs +++ b/OpenSim/Services/InventoryService/InventoryService.cs | |||
@@ -276,11 +276,11 @@ namespace OpenSim.Services.InventoryService | |||
276 | List<InventoryFolderBase> folders = RequestSubFolders(root.ID); | 276 | List<InventoryFolderBase> folders = RequestSubFolders(root.ID); |
277 | 277 | ||
278 | foreach (InventoryFolderBase folder in folders) | 278 | foreach (InventoryFolderBase folder in folders) |
279 | { | 279 | { |
280 | if (folder.Type == (short)type) | 280 | if (folder.Type == (short)type) |
281 | { | 281 | { |
282 | // m_log.DebugFormat( | 282 | // m_log.DebugFormat( |
283 | // "[INVENTORY SERVICE]: Found folder {0} type {1}", folder.Name, (AssetType)folder.Type); | 283 | // "[INVENTORY SERVICE]: Found folder {0} type {1}", folder.Name, (AssetType)folder.Type); |
284 | 284 | ||
285 | return folder; | 285 | return folder; |
286 | } | 286 | } |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 3f9bc19..d30c149 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -308,7 +308,7 @@ namespace OpenSim.Services.LLLoginService | |||
308 | { | 308 | { |
309 | // something went wrong, make something up, so that we don't have to test this anywhere else | 309 | // something went wrong, make something up, so that we don't have to test this anywhere else |
310 | guinfo = new GridUserInfo(); | 310 | guinfo = new GridUserInfo(); |
311 | guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30); | 311 | guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30); |
312 | } | 312 | } |
313 | 313 | ||
314 | // | 314 | // |
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 65c247f..f376cf8 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -97,10 +97,10 @@ namespace OpenSim.Services.UserAccountService | |||
97 | public UserAccount GetUserAccount(UUID scopeID, string firstName, | 97 | public UserAccount GetUserAccount(UUID scopeID, string firstName, |
98 | string lastName) | 98 | string lastName) |
99 | { | 99 | { |
100 | // m_log.DebugFormat( | 100 | // m_log.DebugFormat( |
101 | // "[USER ACCOUNT SERVICE]: Retrieving account by username for {0} {1}, scope {2}", | 101 | // "[USER ACCOUNT SERVICE]: Retrieving account by username for {0} {1}, scope {2}", |
102 | // firstName, lastName, scopeID); | 102 | // firstName, lastName, scopeID); |
103 | 103 | ||
104 | UserAccountData[] d; | 104 | UserAccountData[] d; |
105 | 105 | ||
106 | if (scopeID != UUID.Zero) | 106 | if (scopeID != UUID.Zero) |
@@ -235,10 +235,10 @@ namespace OpenSim.Services.UserAccountService | |||
235 | 235 | ||
236 | public bool StoreUserAccount(UserAccount data) | 236 | public bool StoreUserAccount(UserAccount data) |
237 | { | 237 | { |
238 | // m_log.DebugFormat( | 238 | // m_log.DebugFormat( |
239 | // "[USER ACCOUNT SERVICE]: Storing user account for {0} {1} {2}, scope {3}", | 239 | // "[USER ACCOUNT SERVICE]: Storing user account for {0} {1} {2}, scope {3}", |
240 | // data.FirstName, data.LastName, data.PrincipalID, data.ScopeID); | 240 | // data.FirstName, data.LastName, data.PrincipalID, data.ScopeID); |
241 | 241 | ||
242 | UserAccountData d = new UserAccountData(); | 242 | UserAccountData d = new UserAccountData(); |
243 | 243 | ||
244 | d.FirstName = data.FirstName; | 244 | d.FirstName = data.FirstName; |
@@ -285,7 +285,7 @@ namespace OpenSim.Services.UserAccountService | |||
285 | #endregion | 285 | #endregion |
286 | 286 | ||
287 | #region Console commands | 287 | #region Console commands |
288 | 288 | ||
289 | /// <summary> | 289 | /// <summary> |
290 | /// Handle the create user command from the console. | 290 | /// Handle the create user command from the console. |
291 | /// </summary> | 291 | /// </summary> |
@@ -296,7 +296,7 @@ namespace OpenSim.Services.UserAccountService | |||
296 | string lastName; | 296 | string lastName; |
297 | string password; | 297 | string password; |
298 | string email; | 298 | string email; |
299 | 299 | ||
300 | List<char> excluded = new List<char>(new char[]{' '}); | 300 | List<char> excluded = new List<char>(new char[]{' '}); |
301 | 301 | ||
302 | if (cmdparams.Length < 3) | 302 | if (cmdparams.Length < 3) |