OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Remove some pointless CachedUserInfo != null tests since these are already made in earlier code

0.6.3-post-fixes
Justin Clarke Casey 2009-02-12 17:17:04 +00:00
parent 31ca3a8d4d
commit e7427f21bd
1 changed files with 152 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1200,7 +1200,9 @@ namespace OpenSim.Region.Framework.Scenes
"[PRIM INVENTORY]: " + "[PRIM INVENTORY]: " +
"Avatar {0} cannot be found to add item", "Avatar {0} cannot be found to add item",
avatarId); avatarId);
return null;
} }
if (!profile.HasReceivedInventory) if (!profile.HasReceivedInventory)
profile.FetchInventory(); profile.FetchInventory();
@ -1845,8 +1847,6 @@ namespace OpenSim.Region.Framework.Scenes
userInfo.FetchInventory(); userInfo.FetchInventory();
} }
if (userInfo != null)
{
// If we're returning someone's item, it goes back to the // If we're returning someone's item, it goes back to the
// owner's Lost And Found folder. // owner's Lost And Found folder.
// Delete is treated like return in this case // Delete is treated like return in this case
@ -2014,7 +2014,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
}
return assetID; return assetID;
} }