OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes mantis #4691

soprefactor
Diva Canto 2010-05-16 09:12:40 -07:00
parent b7e6b58857
commit 0b43b263d4
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@ -386,7 +386,7 @@ namespace OpenSim.Services.InventoryService
XInventoryItem[] items = m_Database.GetActiveGestures(principalID); XInventoryItem[] items = m_Database.GetActiveGestures(principalID);
if (items.Length == 0) if (items.Length == 0)
return null; return new List<InventoryItemBase>();
List<InventoryItemBase> ret = new List<InventoryItemBase>(); List<InventoryItemBase> ret = new List<InventoryItemBase>();

4
OpenSim/Services/LLLoginService/LLLoginResponse.cs
View File

@ -217,12 +217,14 @@ namespace OpenSim.Services.LLLoginService
public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
string where, string startlocation, Vector3 position, Vector3 lookAt, string message, string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
GridRegion home, IPEndPoint clientIP) GridRegion home, IPEndPoint clientIP)
: this() : this()
{ {
FillOutInventoryData(invSkel, libService); FillOutInventoryData(invSkel, libService);
ActiveGestures = new ArrayList(gestures);
CircuitCode = (int)aCircuit.circuitcode; CircuitCode = (int)aCircuit.circuitcode;
Lastname = account.LastName; Lastname = account.LastName;
Firstname = account.FirstName; Firstname = account.FirstName;

5
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -272,6 +272,9 @@ namespace OpenSim.Services.LLLoginService
return LLFailedLoginResponse.InventoryProblem; return LLFailedLoginResponse.InventoryProblem;
} }
// Get active gestures
List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(account.PrincipalID);
// //
// Login the presence // Login the presence
// //
@ -350,7 +353,7 @@ namespace OpenSim.Services.LLLoginService
// Finally, fill out the response and return it // Finally, fill out the response and return it
// //
LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
where, startLocation, position, lookAt, m_WelcomeMessage, home, clientIP); where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP);
m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
return response; return response;