From cdd353770691cb3c6bfcb452fc0fe2c2dffa454e Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Thu, 24 Jul 2008 17:19:33 +0000
Subject: [PATCH] * refactor: Remove now redundant inventory server url being
 passed to GetInventorySkeleton

---
 .../Framework/Communications/LoginService.cs  | 21 ++++---------------
 OpenSim/Grid/UserServer/UserLoginService.cs   |  9 ++------
 .../Communications/Local/LocalLoginService.cs |  2 +-
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index e7124c9f62..e95dd21fb2 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Framework.Communications
         /// <param name="userID"></param>
         /// <returns></returns>
         /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception>
-        protected abstract InventoryData GetInventorySkeleton(LLUUID userID, string inventoryServerUrl);
+        protected abstract InventoryData GetInventorySkeleton(LLUUID userID);
 
         /// <summary>
         /// Called when we receive the client's initial XMLRPC login_to_simulator request message
@@ -230,12 +230,7 @@ namespace OpenSim.Framework.Communications
 
                         try
                         {
-                            string inventoryServerUrl = "";
-                            //if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
-                            //{
-                            //    inventoryServerUrl = userProfile.UserInventoryURI;
-                            //}
-                            inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
+                            inventData = GetInventorySkeleton(agentID);
                         }
                         catch (Exception e)
                         {
@@ -390,15 +385,7 @@ namespace OpenSim.Framework.Communications
                     {
                         LLUUID agentID = userProfile.ID;
 
-                        // Inventory Library Section
-
-                        string inventoryServerUrl = "";
-                        //if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
-                        //{
-                        //    inventoryServerUrl = userProfile.UserInventoryURI;
-                        //}
-
-                        InventoryData inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
+                        InventoryData inventData = GetInventorySkeleton(agentID);
                         ArrayList AgentInventoryArray = inventData.InventoryArray;
 
                         Hashtable InventoryRootHash = new Hashtable();
@@ -817,4 +804,4 @@ namespace OpenSim.Framework.Communications
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 6575b13cce..59af373947 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -402,17 +402,12 @@ namespace OpenSim.Grid.UserServer
                         else
                         {
                             response.CreateDeadRegionResponse();
-
                         }
-
-
                     }
                     else
                     {
                         response.CreateDeadRegionResponse();
-
-                    }
-                    
+                    }                    
                 }
 
                 catch (Exception e)
@@ -424,7 +419,7 @@ namespace OpenSim.Grid.UserServer
         }
 
         // See LoginService
-        protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
+        protected override InventoryData GetInventorySkeleton(LLUUID userID)
         {           
             m_log.DebugFormat(
                  "[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 bdd32ea932..f16fd7d976 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -258,7 +258,7 @@ namespace OpenSim.Region.Communications.Local
         }
 
         // See LoginService
-        protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
+        protected override InventoryData GetInventorySkeleton(LLUUID userID)
         {
             List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);