diff options
| author | Mic Bowman | 2011-04-25 10:55:19 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-25 10:55:19 -0700 |
| commit | 2fefb7adeeeb7c6f82ea4fc6969f2e7548d9b912 (patch) | |
| tree | 258076f111c04de0b340770628e4330b5737d235 /OpenSim | |
| parent | Cleaned up various configuration options. Removed the category throttle (diff) | |
| parent | Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails. (diff) | |
| download | opensim-SC_OLD-2fefb7adeeeb7c6f82ea4fc6969f2e7548d9b912.zip opensim-SC_OLD-2fefb7adeeeb7c6f82ea4fc6969f2e7548d9b912.tar.gz opensim-SC_OLD-2fefb7adeeeb7c6f82ea4fc6969f2e7548d9b912.tar.bz2 opensim-SC_OLD-2fefb7adeeeb7c6f82ea4fc6969f2e7548d9b912.tar.xz | |
Merge branch 'master' into queuetest
Diffstat (limited to 'OpenSim')
| -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 = |