aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs10
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 1c5c247..476873a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -744,13 +744,9 @@ namespace OpenSim.Region.Framework.Scenes
744 744
745 if (transactionID == UUID.Zero) 745 if (transactionID == UUID.Zero)
746 { 746 {
747 CachedUserInfo userInfo 747 ScenePresence presence;
748 = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); 748 if (TryGetAvatar(remoteClient.AgentId, out presence))
749
750 if (userInfo != null)
751 { 749 {
752 ScenePresence presence;
753 TryGetAvatar(remoteClient.AgentId, out presence);
754 byte[] data = null; 750 byte[] data = null;
755 751
756 if (invType == (sbyte)InventoryType.Landmark && presence != null) 752 if (invType == (sbyte)InventoryType.Landmark && presence != null)
@@ -772,7 +768,7 @@ namespace OpenSim.Region.Framework.Scenes
772 else 768 else
773 { 769 {
774 m_log.ErrorFormat( 770 m_log.ErrorFormat(
775 "userInfo for agent uuid {0} unexpectedly null in CreateNewInventoryItem", 771 "ScenePresence for agent uuid {0} unexpectedly not found in CreateNewInventoryItem",
776 remoteClient.AgentId); 772 remoteClient.AgentId);
777 } 773 }
778 } 774 }