aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2007-12-01 15:20:49 +0000
committerMW2007-12-01 15:20:49 +0000
commit495cf040be86afbfbdb16f2a4b0dcc369984ab61 (patch)
treecd465b16ed19ebebb40f8a83ea91443b622f7d97 /OpenSim/Region
parentsmall bit of refactoring (diff)
downloadopensim-SC_OLD-495cf040be86afbfbdb16f2a4b0dcc369984ab61.zip
opensim-SC_OLD-495cf040be86afbfbdb16f2a4b0dcc369984ab61.tar.gz
opensim-SC_OLD-495cf040be86afbfbdb16f2a4b0dcc369984ab61.tar.bz2
opensim-SC_OLD-495cf040be86afbfbdb16f2a4b0dcc369984ab61.tar.xz
Attempted fix for mantis issue# 66
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 5b6b9cb..a2fd01f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -167,14 +167,23 @@ namespace OpenSim.Region.Environment.Scenes
167 return; 167 return;
168 } 168 }
169 169
170 item = userInfo.RootFolder.HasItem(oldItemID); 170 if (userInfo.RootFolder != null)
171 if (item == null) 171 {
172 item = userInfo.RootFolder.HasItem(oldItemID);
173 if (item == null)
174 {
175 MainLog.Instance.Warn("INVENTORY", "Failed to find item " + oldItemID.ToString());
176 return;
177 }
178 }
179 else
172 { 180 {
173 MainLog.Instance.Warn("INVENTORY", "Failed to find item " + oldItemID.ToString()); 181 MainLog.Instance.Warn("INVENTORY", "Failed to find item " + oldItemID.ToString());
174 return; 182 return;
175 } 183 }
176 } 184 }
177 185
186
178 AssetBase asset = AssetCache.CopyAsset(item.assetID); 187 AssetBase asset = AssetCache.CopyAsset(item.assetID);
179 if (asset == null) 188 if (asset == null)
180 { 189 {