From d3ab5ad506477bb7dbcff61893afc91aef931158 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 29 Nov 2007 20:20:11 +0000
Subject: revert r2510, this seems to break normal logins, at least from Linux
 clients.

---
 OpenSim/Framework/Communications/LoginResponse.cs | 10 +---------
 OpenSim/Framework/Communications/LoginService.cs  |  7 -------
 2 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index dccba1c..98a6cfc 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -55,7 +55,6 @@ namespace OpenSim.Framework.UserManagement
         private ArrayList initialOutfit;
         private ArrayList agentInventory;
         private ArrayList inventoryLibraryOwner;
-        private ArrayList inventoryLibRoot;
         private ArrayList inventoryLibrary;
 
         private UserInfo userProfile;
@@ -283,7 +282,6 @@ namespace OpenSim.Framework.UserManagement
                 responseData["inventory-skeleton"] = agentInventory;
                 responseData["inventory-skel-lib"] = inventoryLibrary;
                 responseData["inventory-root"] = inventoryRoot;
-                responseData["inventory-lib-root"] = inventoryLibRoot;
                 responseData["gestures"] = new ArrayList(); // todo
                 responseData["inventory-lib-owner"] = inventoryLibraryOwner;
                 responseData["initial-outfit"] = initialOutfit;
@@ -507,12 +505,6 @@ namespace OpenSim.Framework.UserManagement
             set { inventoryLibraryOwner = value; }
         }
 
-        public ArrayList InventoryLibRoot
-        {
-            get { return inventoryLibRoot; }
-            set { inventoryLibRoot = value; }
-        }
-
         public string Home
         {
             get { return home; }
@@ -591,4 +583,4 @@ namespace OpenSim.Framework.UserManagement
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 239bada..118668c 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -130,13 +130,6 @@ namespace OpenSim.Framework.UserManagement
                         logResponse.InventoryRoot = InventoryRoot;
                         logResponse.InventorySkeleton = AgentInventoryArray;
                         logResponse.InventoryLibrary = GetInventoryLibrary();
-
-                        Hashtable InventoryLibRootHash = new Hashtable();
-                        InventoryLibRootHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";
-                        ArrayList InventoryLibRoot = new ArrayList();
-                        InventoryLibRoot.Add(InventoryLibRootHash);
-                        logResponse.InventoryLibRoot = InventoryLibRoot;
-
                         logResponse.InventoryLibraryOwner = GetLibraryOwner();
                         logResponse.CircuitCode = (Int32)circode;
                         //logResponse.RegionX = 0; //overwritten
-- 
cgit v1.1