aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs2
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs4
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs5
3 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 4d7103b..974caf0 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -386,7 +386,7 @@ namespace OpenSim.Services.InventoryService
386 XInventoryItem[] items = m_Database.GetActiveGestures(principalID); 386 XInventoryItem[] items = m_Database.GetActiveGestures(principalID);
387 387
388 if (items.Length == 0) 388 if (items.Length == 0)
389 return null; 389 return new List<InventoryItemBase>();
390 390
391 List<InventoryItemBase> ret = new List<InventoryItemBase>(); 391 List<InventoryItemBase> ret = new List<InventoryItemBase>();
392 392
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index d1dcfe7..32809ca 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -217,12 +217,14 @@ namespace OpenSim.Services.LLLoginService
217 217
218 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, 218 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
219 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 219 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
220 string where, string startlocation, Vector3 position, Vector3 lookAt, string message, 220 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
221 GridRegion home, IPEndPoint clientIP) 221 GridRegion home, IPEndPoint clientIP)
222 : this() 222 : this()
223 { 223 {
224 FillOutInventoryData(invSkel, libService); 224 FillOutInventoryData(invSkel, libService);
225 225
226 ActiveGestures = new ArrayList(gestures);
227
226 CircuitCode = (int)aCircuit.circuitcode; 228 CircuitCode = (int)aCircuit.circuitcode;
227 Lastname = account.LastName; 229 Lastname = account.LastName;
228 Firstname = account.FirstName; 230 Firstname = account.FirstName;
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 712b899..535cf42 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -272,6 +272,9 @@ namespace OpenSim.Services.LLLoginService
272 return LLFailedLoginResponse.InventoryProblem; 272 return LLFailedLoginResponse.InventoryProblem;
273 } 273 }
274 274
275 // Get active gestures
276 List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID);
277
275 // 278 //
276 // Login the presence 279 // Login the presence
277 // 280 //
@@ -350,7 +353,7 @@ namespace OpenSim.Services.LLLoginService
350 // Finally, fill out the response and return it 353 // Finally, fill out the response and return it
351 // 354 //
352 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 355 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
353 where, startLocation, position, lookAt, m_WelcomeMessage, home, clientIP); 356 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP);
354 357
355 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); 358 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
356 return response; 359 return response;