diff options
| author | Melanie Thielker | 2008-08-15 10:07:45 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-08-15 10:07:45 +0000 |
| commit | e1620c5cc36bfdba23b60b7b9faa776c92103027 (patch) | |
| tree | 928cab741daa38525c1a6cc338eba3f380e4bb19 /OpenSim/Region/Environment/Scenes | |
| parent | From: Richard Alimi <ralimi@us.ibm.com> (diff) | |
| download | opensim-SC-e1620c5cc36bfdba23b60b7b9faa776c92103027.zip opensim-SC-e1620c5cc36bfdba23b60b7b9faa776c92103027.tar.gz opensim-SC-e1620c5cc36bfdba23b60b7b9faa776c92103027.tar.bz2 opensim-SC-e1620c5cc36bfdba23b60b7b9faa776c92103027.tar.xz | |
Fixes a case where, when inventory is not currently accessible due
to other issues, detaching an attachment would cause an exception.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 23dd8b6..ca77f2b 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
| @@ -1712,7 +1712,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1712 | 1712 | ||
| 1713 | CachedUserInfo userInfo = | 1713 | CachedUserInfo userInfo = |
| 1714 | CommsManager.UserProfileCacheService.GetUserDetails(agentID); | 1714 | CommsManager.UserProfileCacheService.GetUserDetails(agentID); |
| 1715 | if (userInfo != null) | 1715 | if (userInfo != null && userInfo.RootFolder != null) |
| 1716 | { | 1716 | { |
| 1717 | Queue<InventoryFolderImpl> searchfolders = new Queue<InventoryFolderImpl>(); | 1717 | Queue<InventoryFolderImpl> searchfolders = new Queue<InventoryFolderImpl>(); |
| 1718 | searchfolders.Enqueue(userInfo.RootFolder); | 1718 | searchfolders.Enqueue(userInfo.RootFolder); |