aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Services/LoginResponse.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/Services/LoginResponse.cs')
-rw-r--r--OpenSim/Framework/Communications/Services/LoginResponse.cs9
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
371 responseData["classified_categories"] = classifiedCategories; 371 responseData["classified_categories"] = classifiedCategories;
372 responseData["ui-config"] = uiConfig; 372 responseData["ui-config"] = uiConfig;
373 373
374 responseData["inventory-skeleton"] = agentInventory; 374 if (agentInventory != null)
375 {
376 responseData["inventory-skeleton"] = agentInventory;
377 responseData["inventory-root"] = inventoryRoot;
378 }
375 responseData["inventory-skel-lib"] = inventoryLibrary; 379 responseData["inventory-skel-lib"] = inventoryLibrary;
376 responseData["inventory-root"] = inventoryRoot;
377 responseData["inventory-lib-root"] = inventoryLibRoot; 380 responseData["inventory-lib-root"] = inventoryLibRoot;
378 responseData["gestures"] = activeGestures; 381 responseData["gestures"] = activeGestures;
379 responseData["inventory-lib-owner"] = inventoryLibraryOwner; 382 responseData["inventory-lib-owner"] = inventoryLibraryOwner;
@@ -386,8 +389,6 @@ namespace OpenSim.Framework.Communications.Services
386 responseData["region_x"] = (Int32)(RegionX * Constants.RegionSize); 389 responseData["region_x"] = (Int32)(RegionX * Constants.RegionSize);
387 responseData["region_y"] = (Int32)(RegionY * Constants.RegionSize); 390 responseData["region_y"] = (Int32)(RegionY * Constants.RegionSize);
388 391
389 //responseData["inventory-lib-root"] = new ArrayList(); // todo
390
391 if (m_buddyList != null) 392 if (m_buddyList != null)
392 { 393 {
393 responseData["buddy-list"] = m_buddyList.ToArray(); 394 responseData["buddy-list"] = m_buddyList.ToArray();