disabled the multiple inventory server support in login service again.

And reverted CachedUserInfo back to revision 5262. 
I don't think most of the inventory problems that people are reporting are due to these, but its easier to deal with one set of potential problems at a time, and I'm not going to get any time in the week to work on this anyway.

1 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 3e1a885..e7124c9 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -231,10 +231,10 @@ namespace OpenSim.Framework.Communications
                         try
                         {
                             string inventoryServerUrl = "";
-                            if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
-                            {
-                                inventoryServerUrl = userProfile.UserInventoryURI;
-                            }
+                            //if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
+                            //{
+                            //    inventoryServerUrl = userProfile.UserInventoryURI;
+                            //}
                             inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
                         }
                         catch (Exception e)
@@ -393,10 +393,10 @@ namespace OpenSim.Framework.Communications
                         // Inventory Library Section
 
                         string inventoryServerUrl = "";
-                        if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
-                        {
-                            inventoryServerUrl = userProfile.UserInventoryURI;
-                        }
+                        //if (!String.IsNullOrEmpty(userProfile.UserInventoryURI))
+                        //{
+                        //    inventoryServerUrl = userProfile.UserInventoryURI;
+                        //}
 
                         InventoryData inventData = GetInventorySkeleton(agentID, inventoryServerUrl);
                         ArrayList AgentInventoryArray = inventData.InventoryArray;