diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 18 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 1 |
2 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 32809ca..54d53fb 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -223,7 +223,7 @@ namespace OpenSim.Services.LLLoginService | |||
223 | { | 223 | { |
224 | FillOutInventoryData(invSkel, libService); | 224 | FillOutInventoryData(invSkel, libService); |
225 | 225 | ||
226 | ActiveGestures = new ArrayList(gestures); | 226 | FillOutActiveGestures(gestures); |
227 | 227 | ||
228 | CircuitCode = (int)aCircuit.circuitcode; | 228 | CircuitCode = (int)aCircuit.circuitcode; |
229 | Lastname = account.LastName; | 229 | Lastname = account.LastName; |
@@ -285,6 +285,22 @@ namespace OpenSim.Services.LLLoginService | |||
285 | } | 285 | } |
286 | } | 286 | } |
287 | 287 | ||
288 | private void FillOutActiveGestures(List<InventoryItemBase> gestures) | ||
289 | { | ||
290 | ArrayList list = new ArrayList(); | ||
291 | if (gestures != null) | ||
292 | { | ||
293 | foreach (InventoryItemBase gesture in gestures) | ||
294 | { | ||
295 | Hashtable item = new Hashtable(); | ||
296 | item["item_id"] = gesture.ID.ToString(); | ||
297 | item["asset_id"] = gesture.AssetID.ToString(); | ||
298 | list.Add(item); | ||
299 | } | ||
300 | } | ||
301 | ActiveGestures = list; | ||
302 | } | ||
303 | |||
288 | private void FillOutHomeData(GridUserInfo pinfo, GridRegion home) | 304 | private void FillOutHomeData(GridUserInfo pinfo, GridRegion home) |
289 | { | 305 | { |
290 | int x = 1000 * (int)Constants.RegionSize, y = 1000 * (int)Constants.RegionSize; | 306 | int x = 1000 * (int)Constants.RegionSize, y = 1000 * (int)Constants.RegionSize; |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 535cf42..6319cc4 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -274,6 +274,7 @@ namespace OpenSim.Services.LLLoginService | |||
274 | 274 | ||
275 | // Get active gestures | 275 | // Get active gestures |
276 | List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID); | 276 | List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID); |
277 | m_log.DebugFormat("[LLOGIN SERVICE]: {0} active gestures", gestures.Count); | ||
277 | 278 | ||
278 | // | 279 | // |
279 | // Login the presence | 280 | // Login the presence |