aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs21
1 files changed, 4 insertions, 17 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}