aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-04-25 08:53:48 -0700
committerDiva Canto2011-04-25 09:06:45 -0700
commitf7d47bbb1fa1de65e1c6760ea27ea6781d60c018 (patch)
tree175041b4fd859af352d4a5b0c4c1b4c7ac517e3b
parentRemoved unused libraries: RAILS.dll and dependencies. (diff)
downloadopensim-SC_OLD-f7d47bbb1fa1de65e1c6760ea27ea6781d60c018.zip
opensim-SC_OLD-f7d47bbb1fa1de65e1c6760ea27ea6781d60c018.tar.gz
opensim-SC_OLD-f7d47bbb1fa1de65e1c6760ea27ea6781d60c018.tar.bz2
opensim-SC_OLD-f7d47bbb1fa1de65e1c6760ea27ea6781d60c018.tar.xz
Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.
-rw-r--r--OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
index cd9f2bf..a662abb 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
@@ -158,7 +158,10 @@ namespace OpenSim.Services.Connectors
158 public InventoryCollection GetFolderContent(UUID principalID, UUID folderID) 158 public InventoryCollection GetFolderContent(UUID principalID, UUID folderID)
159 { 159 {
160 InventoryCollection inventory = new InventoryCollection(); 160 InventoryCollection inventory = new InventoryCollection();
161 161 inventory.Folders = new List<InventoryFolderBase>();
162 inventory.Items = new List<InventoryItemBase>();
163 inventory.UserID = principalID;
164
162 try 165 try
163 { 166 {
164 Dictionary<string,object> ret = MakeRequest("GETFOLDERCONTENT", 167 Dictionary<string,object> ret = MakeRequest("GETFOLDERCONTENT",
@@ -172,11 +175,6 @@ namespace OpenSim.Services.Connectors
172 if (ret.Count == 0) 175 if (ret.Count == 0)
173 return null; 176 return null;
174 177
175
176 inventory.Folders = new List<InventoryFolderBase>();
177 inventory.Items = new List<InventoryItemBase>();
178 inventory.UserID = principalID;
179
180 Dictionary<string,object> folders = 178 Dictionary<string,object> folders =
181 (Dictionary<string,object>)ret["FOLDERS"]; 179 (Dictionary<string,object>)ret["FOLDERS"];
182 Dictionary<string,object> items = 180 Dictionary<string,object> items =