2 files changed, 64 insertions, 2 deletions

diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
index 4d5ec5f..b5a4184 100644
--- a/OpenSim/Framework/UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -27,6 +27,8 @@ namespace OpenSim.Framework.UserManagement
         private ArrayList inventoryRoot;
         private ArrayList initialOutfit;
         private ArrayList agentInventory;
+        private ArrayList inventoryLibraryOwner;
+        private ArrayList inventoryLibrary;
 
         private UserInfo userProfile;
 
@@ -87,6 +89,8 @@ namespace OpenSim.Framework.UserManagement
             this.inventoryRoot = new ArrayList();
             this.initialOutfit = new ArrayList();
             this.agentInventory = new ArrayList();
+            this.inventoryLibrary = new ArrayList();
+            this.inventoryLibraryOwner = new ArrayList();
 
             this.xmlRpcResponse = new XmlRpcResponse();
             this.defaultXmlRpcResponse = new XmlRpcResponse();
@@ -234,10 +238,10 @@ namespace OpenSim.Framework.UserManagement
                 responseData["ui-config"] = this.uiConfig;
 
                 responseData["inventory-skeleton"] = this.agentInventory;
-                responseData["inventory-skel-lib"] = new ArrayList(); // todo
+                responseData["inventory-skel-lib"] = this.inventoryLibrary;
                 responseData["inventory-root"] = this.inventoryRoot;
                 responseData["gestures"] = new ArrayList(); // todo
-                responseData["inventory-lib-owner"] = new ArrayList(); // todo
+                responseData["inventory-lib-owner"] = this.inventoryLibraryOwner;
                 responseData["initial-outfit"] = this.initialOutfit;
                 responseData["start_location"] = this.startLocation;
                 responseData["seed_capability"] = this.seedCapability;
@@ -600,6 +604,30 @@ namespace OpenSim.Framework.UserManagement
             }
         }
 
+        public ArrayList InventoryLibrary
+        {
+            get
+            {
+                return this.inventoryLibrary;
+            }
+            set
+            {
+                this.inventoryLibrary = value;
+            }
+        }
+
+        public ArrayList InventoryLibraryOwner
+        {
+            get
+            {
+                return this.inventoryLibraryOwner;
+            }
+            set
+            {
+                this.inventoryLibraryOwner = value;
+            }
+        }
+
         public string Home
         {
             get
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index a103f25..1acafeb 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -347,6 +347,38 @@ namespace OpenSim.Framework.UserManagement
         }
 
         /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected virtual ArrayList GetInventoryLibrary()
+        {
+            //return new ArrayList();
+            Hashtable TempHash = new Hashtable();
+            TempHash["name"] = "OpenSim Library";
+            TempHash["parent_id"] = LLUUID.Zero.ToStringHyphenated();
+            TempHash["version"] = "1";
+            TempHash["type_default"] = "-1";
+            TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";
+            ArrayList temp = new ArrayList();
+            temp.Add(TempHash);
+            return temp;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected virtual ArrayList GetLibraryOwner()
+        {
+            //for now create random inventory library owner
+            Hashtable TempHash = new Hashtable();
+            TempHash["agent_id"] = "11111111-1111-0000-0000-000100bba000";
+            ArrayList inventoryLibOwner = new ArrayList();
+            inventoryLibOwner.Add(TempHash);
+            return inventoryLibOwner;
+        }
+
+        /// <summary>
         /// Customises the login response and fills in missing values.
         /// </summary>
         /// <param name="response">The existing response</param>
@@ -446,6 +478,8 @@ namespace OpenSim.Framework.UserManagement
                     logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated();
                     logResponse.InventoryRoot = InventoryRoot;
                     logResponse.InventorySkeleton = AgentInventoryArray;
+                    logResponse.InventoryLibrary = this.GetInventoryLibrary();
+                    logResponse.InventoryLibraryOwner = this.GetLibraryOwner();
                     logResponse.CircuitCode = (Int32)circode;
                     //logResponse.RegionX = 0; //overwritten
                     //logResponse.RegionY = 0; //overwritten