Redirected all calls to CachedUserProfile methods to the inventory service. Redirection of the RootFolder property is still todo. This compiles but probably inventory will be inconsistent.

1 files changed, 15 insertions, 24 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 102feaf..e61648c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -33,6 +33,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Gestures
 {
@@ -62,42 +63,32 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
         
         public virtual void ActivateGesture(IClientAPI client, UUID assetId, UUID gestureId)
         {
-            CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(client.AgentId);
+            IInventoryService invService = m_scene.InventoryService;
 
-            if (userInfo != null)
+            InventoryItemBase item = invService.QueryItem(new InventoryItemBase(gestureId));
+            if (item != null)
             {
-                InventoryItemBase item = userInfo.RootFolder.FindItem(gestureId);
-                if (item != null)
-                {
-                    item.Flags = 1;
-                    userInfo.UpdateItem(item);
-                }
-                else 
-                    m_log.ErrorFormat(
-                        "[GESTURES]: Unable to find gesture to activate {0} for {1}", gestureId, client.Name);
+                item.Flags = 1;
+                invService.UpdateItem(item);
             }
             else 
-                m_log.ErrorFormat("[GESTURES]: Unable to find user {0}", client.Name);
+                m_log.WarnFormat(
+                    "[GESTURES]: Unable to find gesture {0} to activate for {1}", gestureId, client.Name);
         }
 
         public virtual void DeactivateGesture(IClientAPI client, UUID gestureId)
         {
-            CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(client.AgentId);
+            IInventoryService invService = m_scene.InventoryService;
 
-            if (userInfo != null)
+            InventoryItemBase item = invService.QueryItem(new InventoryItemBase(gestureId));
+            if (item != null)
             {
-                InventoryItemBase item = userInfo.RootFolder.FindItem(gestureId);
-                if (item != null)
-                {
-                    item.Flags = 0;
-                    userInfo.UpdateItem(item);
-                }
-                else 
-                    m_log.ErrorFormat(
-                        "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name);
+                item.Flags = 0;
+                invService.UpdateItem(item);
             }
             else 
-                m_log.ErrorFormat("[GESTURES]: Unable to find user {0}", client.Name);
+                m_log.ErrorFormat(
+                    "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name);
         }        
     }
 }
\ No newline at end of file