diff options
author | BlueWall | 2013-05-09 10:46:37 -0400 |
---|---|---|
committer | BlueWall | 2013-05-09 10:50:18 -0400 |
commit | 182ea00cb30042d8ff7f6184f480d7c39e2be8a1 (patch) | |
tree | d301398f177dc229c8c7ba4f5e75b8d4ab4833bc /OpenSim/Services/LLLoginService/LLLoginService.cs | |
parent | Guard the scene list when estates are updated (diff) | |
download | opensim-SC_OLD-182ea00cb30042d8ff7f6184f480d7c39e2be8a1.zip opensim-SC_OLD-182ea00cb30042d8ff7f6184f480d7c39e2be8a1.tar.gz opensim-SC_OLD-182ea00cb30042d8ff7f6184f480d7c39e2be8a1.tar.bz2 opensim-SC_OLD-182ea00cb30042d8ff7f6184f480d7c39e2be8a1.tar.xz |
Application support:
Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 53a22d4..abda98f 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -78,6 +78,8 @@ namespace OpenSim.Services.LLLoginService | |||
78 | protected string m_OpenIDURL; | 78 | protected string m_OpenIDURL; |
79 | protected string m_SearchURL; | 79 | protected string m_SearchURL; |
80 | protected string m_Currency; | 80 | protected string m_Currency; |
81 | protected string m_DestinationGuide; | ||
82 | protected string m_AvatarPicker; | ||
81 | 83 | ||
82 | protected string m_AllowedClients; | 84 | protected string m_AllowedClients; |
83 | protected string m_DeniedClients; | 85 | protected string m_DeniedClients; |
@@ -117,6 +119,8 @@ namespace OpenSim.Services.LLLoginService | |||
117 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); | 119 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); |
118 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); | 120 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); |
119 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); | 121 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); |
122 | m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty); | ||
123 | m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty); | ||
120 | 124 | ||
121 | m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); | 125 | m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); |
122 | m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); | 126 | m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); |
@@ -453,7 +457,8 @@ namespace OpenSim.Services.LLLoginService | |||
453 | = new LLLoginResponse( | 457 | = new LLLoginResponse( |
454 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 458 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
455 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, | 459 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, |
456 | m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone); | 460 | m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, |
461 | m_DestinationGuide, m_AvatarPicker); | ||
457 | 462 | ||
458 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); | 463 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); |
459 | 464 | ||