diff options
author | Diva Canto | 2011-04-25 08:53:48 -0700 |
---|---|---|
committer | Diva Canto | 2011-04-25 08:53:48 -0700 |
commit | 3a38bd8854a93bb23308e4f09b02fd7b0aa672ce (patch) | |
tree | 1a7a409655a7444df6cf9bcad2eaaa9a6a79f272 | |
parent | Removed unused libraries: RAILS.dll and dependencies. (diff) | |
download | opensim-SC-3a38bd8854a93bb23308e4f09b02fd7b0aa672ce.zip opensim-SC-3a38bd8854a93bb23308e4f09b02fd7b0aa672ce.tar.gz opensim-SC-3a38bd8854a93bb23308e4f09b02fd7b0aa672ce.tar.bz2 opensim-SC-3a38bd8854a93bb23308e4f09b02fd7b0aa672ce.tar.xz |
Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | 10 |
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 = |