diff options
| author | Justin Clark-Casey (justincc) | 2012-04-06 20:29:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-04-06 20:29:54 +0100 |
| commit | 908cebbea8d7e685223b22ef8216971daccbdd53 (patch) | |
| tree | 9827cf434e8013a4618bb278857d68373054f882 /OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | |
| parent | remove possible PhysActor unexpectedly null race conditions when changing pri... (diff) | |
| parent | Deleted the unused and commented code from 2 commits ago. (diff) | |
| download | opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.zip opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.gz opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.bz2 opensim-SC_OLD-908cebbea8d7e685223b22ef8216971daccbdd53.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs index 8b44f72..d5c062b 100644 --- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | |||
| @@ -162,7 +162,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 162 | invFetch.owner_id, invFetch.folder_id, invFetch.owner_id, | 162 | invFetch.owner_id, invFetch.folder_id, invFetch.owner_id, |
| 163 | invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version); | 163 | invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version); |
| 164 | 164 | ||
| 165 | if (inv.Folders != null) | 165 | if (inv != null && inv.Folders != null) |
| 166 | { | 166 | { |
| 167 | foreach (InventoryFolderBase invFolder in inv.Folders) | 167 | foreach (InventoryFolderBase invFolder in inv.Folders) |
| 168 | { | 168 | { |
| @@ -170,7 +170,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 170 | } | 170 | } |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | if (inv.Items != null) | 173 | if (inv != null && inv.Items != null) |
| 174 | { | 174 | { |
| 175 | foreach (InventoryItemBase invItem in inv.Items) | 175 | foreach (InventoryItemBase invItem in inv.Items) |
| 176 | { | 176 | { |