1 files changed, 5 insertions, 4 deletions

diff --git a/OpenSim/Framework/Communications/Services/LoginResponse.cs b/OpenSim/Framework/Communications/Services/LoginResponse.cs
index db208a4..c81febd 100644
--- a/OpenSim/Framework/Communications/Services/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/Services/LoginResponse.cs
@@ -371,9 +371,12 @@ namespace OpenSim.Framework.Communications.Services
                 responseData["classified_categories"] = classifiedCategories;
                 responseData["ui-config"] = uiConfig;
 
-                responseData["inventory-skeleton"] = agentInventory;
+                if (agentInventory != null)
+                {
+                    responseData["inventory-skeleton"] = agentInventory;
+                    responseData["inventory-root"] = inventoryRoot;
+                }
                 responseData["inventory-skel-lib"] = inventoryLibrary;
-                responseData["inventory-root"] = inventoryRoot;
                 responseData["inventory-lib-root"] = inventoryLibRoot;
                 responseData["gestures"] = activeGestures;
                 responseData["inventory-lib-owner"] = inventoryLibraryOwner;
@@ -386,8 +389,6 @@ namespace OpenSim.Framework.Communications.Services
                 responseData["region_x"] = (Int32)(RegionX * Constants.RegionSize);
                 responseData["region_y"] = (Int32)(RegionY * Constants.RegionSize);
 
-                //responseData["inventory-lib-root"] = new ArrayList(); // todo
-
                 if (m_buddyList != null)
                 {
                     responseData["buddy-list"] = m_buddyList.ToArray();