From feaa64507183c6bedac790f5c3986cda191a5c3e Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 20 Mar 2009 06:49:12 +0000
Subject: * De-duplicated login service some more * Normalized
m_inventoryService * Pulled AddActiveGestures up
---
OpenSim/Framework/Communications/LoginService.cs | 33 +++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Framework/Communications')
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 92bf83f..b84f5b6 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -60,6 +60,11 @@ namespace OpenSim.Framework.Communications
protected uint m_defaultHomeY;
///
+ /// Used by the login service to make requests to the inventory service.
+ ///
+ protected IInterServiceInventoryServices m_inventoryService;
+
+ ///
/// Constructor
///
///
@@ -1008,7 +1013,33 @@ namespace OpenSim.Framework.Communications
protected abstract RegionInfo RequestClosestRegion(string region);
protected abstract RegionInfo GetRegionInfo(ulong homeRegionHandle);
protected abstract RegionInfo GetRegionInfo(UUID homeRegionId);
- protected abstract void AddActiveGestures(LoginResponse response, UserProfileData theUser);
protected abstract bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response);
+
+ ///
+ /// Add active gestures of the user to the login response.
+ ///
+ ///
+ /// A
+ ///
+ ///
+ /// A
+ ///
+ protected void AddActiveGestures(LoginResponse response, UserProfileData theUser)
+ {
+ List gestures = m_inventoryService.GetActiveGestures(theUser.ID);
+ //m_log.DebugFormat("[LOGIN]: AddActiveGestures, found {0}", gestures == null ? 0 : gestures.Count);
+ ArrayList list = new ArrayList();
+ if (gestures != null)
+ {
+ foreach (InventoryItemBase gesture in gestures)
+ {
+ Hashtable item = new Hashtable();
+ item["item_id"] = gesture.ID.ToString();
+ item["asset_id"] = gesture.AssetID.ToString();
+ list.Add(item);
+ }
+ }
+ response.ActiveGestures = list;
+ }
}
}
--
cgit v1.1