diff options
author | Diva Canto | 2010-01-10 10:40:07 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 10:40:07 -0800 |
commit | 1e1b2ab221851efc414678b7ea52ef2ca788ce9f (patch) | |
tree | 29b6aa80e54a9c18529ae14e7d185fe67582d151 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Add a "LockedOut" flag to allow locking a region out via the grid server. (diff) | |
download | opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.zip opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.gz opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.bz2 opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.xz |
* OMG! All but one references to UserProfileCacheService have been rerouted!
* HG is seriously broken here
* Compiles. Untested.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 |
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 | } |