aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs21
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs9
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs2
3 files changed, 7 insertions, 25 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index e7124c9..e95dd21 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Framework.Communications
94 /// <param name="userID"></param> 94 /// <param name="userID"></param>
95 /// <returns></returns> 95 /// <returns></returns>
96 /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception> 96 /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception>
97 protected abstract InventoryData GetInventorySkeleton(LLUUID userID, string inventoryServerUrl); 97 protected abstract InventoryData GetInventorySkeleton(LLUUID userID);
98 98
99 /// <summary> 99 /// <summary>
100 /// Called when we receive the client's initial XMLRPC login_to_simulator request message 100 /// Called when we receive the client's initial XMLRPC login_to_simulator request message
@@ -230,12 +230,7 @@ namespace OpenSim.Framework.Communications
230 230
231 try 231 try
232 { 232 {
233 string inventoryServerUrl = ""; 233 inventData = GetInventorySkeleton(agentID);
234 //if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
235 //{
236 // inventoryServerUrl = userProfile.UserInventoryURI;
237 //}
238 inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
239 } 234 }
240 catch (Exception e) 235 catch (Exception e)
241 { 236 {
@@ -390,15 +385,7 @@ namespace OpenSim.Framework.Communications
390 { 385 {
391 LLUUID agentID = userProfile.ID; 386 LLUUID agentID = userProfile.ID;
392 387
393 // Inventory Library Section 388 InventoryData inventData = GetInventorySkeleton(agentID);
394
395 string inventoryServerUrl = "";
396 //if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
397 //{
398 // inventoryServerUrl = userProfile.UserInventoryURI;
399 //}
400
401 InventoryData inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
402 ArrayList AgentInventoryArray = inventData.InventoryArray; 389 ArrayList AgentInventoryArray = inventData.InventoryArray;
403 390
404 Hashtable InventoryRootHash = new Hashtable(); 391 Hashtable InventoryRootHash = new Hashtable();
@@ -817,4 +804,4 @@ namespace OpenSim.Framework.Communications
817 } 804 }
818 } 805 }
819 } 806 }
820} \ No newline at end of file 807}
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 6575b13..59af373 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -402,17 +402,12 @@ namespace OpenSim.Grid.UserServer
402 else 402 else
403 { 403 {
404 response.CreateDeadRegionResponse(); 404 response.CreateDeadRegionResponse();
405
406 } 405 }
407
408
409 } 406 }
410 else 407 else
411 { 408 {
412 response.CreateDeadRegionResponse(); 409 response.CreateDeadRegionResponse();
413 410 }
414 }
415
416 } 411 }
417 412
418 catch (Exception e) 413 catch (Exception e)
@@ -424,7 +419,7 @@ namespace OpenSim.Grid.UserServer
424 } 419 }
425 420
426 // See LoginService 421 // See LoginService
427 protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) 422 protected override InventoryData GetInventorySkeleton(LLUUID userID)
428 { 423 {
429 m_log.DebugFormat( 424 m_log.DebugFormat(
430 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", 425 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index bdd32ea..f16fd7d 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -258,7 +258,7 @@ namespace OpenSim.Region.Communications.Local
258 } 258 }
259 259
260 // See LoginService 260 // See LoginService
261 protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) 261 protected override InventoryData GetInventorySkeleton(LLUUID userID)
262 { 262 {
263 List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID); 263 List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
264 264