diff options
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index e7dd15e..d8a2054 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -75,6 +75,7 @@ namespace OpenSim.Services.LLLoginService | |||
75 | protected bool m_AllowRemoteSetLoginLevel; | 75 | protected bool m_AllowRemoteSetLoginLevel; |
76 | protected string m_MapTileURL; | 76 | protected string m_MapTileURL; |
77 | protected string m_SearchURL; | 77 | protected string m_SearchURL; |
78 | protected string m_Currency; | ||
78 | 79 | ||
79 | protected string m_AllowedClients; | 80 | protected string m_AllowedClients; |
80 | protected string m_DeniedClients; | 81 | protected string m_DeniedClients; |
@@ -108,6 +109,7 @@ namespace OpenSim.Services.LLLoginService | |||
108 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); | 109 | m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); |
109 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 110 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); |
110 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); | 111 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); |
112 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); | ||
111 | 113 | ||
112 | m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); | 114 | m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); |
113 | m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); | 115 | m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); |
@@ -408,14 +410,14 @@ namespace OpenSim.Services.LLLoginService | |||
408 | if (m_FriendsService != null) | 410 | if (m_FriendsService != null) |
409 | { | 411 | { |
410 | friendsList = m_FriendsService.GetFriends(account.PrincipalID); | 412 | friendsList = m_FriendsService.GetFriends(account.PrincipalID); |
411 | m_log.DebugFormat("[LLOGIN SERVICE]: Retrieved {0} friends", friendsList.Length); | 413 | // m_log.DebugFormat("[LLOGIN SERVICE]: Retrieved {0} friends", friendsList.Length); |
412 | } | 414 | } |
413 | 415 | ||
414 | // | 416 | // |
415 | // Finally, fill out the response and return it | 417 | // Finally, fill out the response and return it |
416 | // | 418 | // |
417 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 419 | LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
418 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL); | 420 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL, m_Currency); |
419 | 421 | ||
420 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); | 422 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); |
421 | return response; | 423 | return response; |
@@ -792,7 +794,7 @@ namespace OpenSim.Services.LLLoginService | |||
792 | if (avatar != null) | 794 | if (avatar != null) |
793 | aCircuit.Appearance = new AvatarAppearance(avatar); | 795 | aCircuit.Appearance = new AvatarAppearance(avatar); |
794 | else | 796 | else |
795 | aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); | 797 | aCircuit.Appearance = new AvatarAppearance(); |
796 | 798 | ||
797 | //aCircuit.BaseFolder = irrelevant | 799 | //aCircuit.BaseFolder = irrelevant |
798 | aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); | 800 | aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); |