aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2013-05-09 10:46:37 -0400
committerBlueWall2013-05-09 10:50:18 -0400
commit182ea00cb30042d8ff7f6184f480d7c39e2be8a1 (patch)
treed301398f177dc229c8c7ba4f5e75b8d4ab4833bc /OpenSim
parentGuard the scene list when estates are updated (diff)
downloadopensim-SC-182ea00cb30042d8ff7f6184f480d7c39e2be8a1.zip
opensim-SC-182ea00cb30042d8ff7f6184f480d7c39e2be8a1.tar.gz
opensim-SC-182ea00cb30042d8ff7f6184f480d7c39e2be8a1.tar.bz2
opensim-SC-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/LLLoginResponse.cs20
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs7
2 files changed, 25 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 9ec744f..400f303 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -227,7 +227,7 @@ namespace OpenSim.Services.LLLoginService
227 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 227 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
228 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, 228 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
229 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, 229 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
230 string DSTZone) 230 string DSTZone, string destinationsURL, string avatarsURL)
231 : this() 231 : this()
232 { 232 {
233 FillOutInventoryData(invSkel, libService); 233 FillOutInventoryData(invSkel, libService);
@@ -246,6 +246,8 @@ namespace OpenSim.Services.LLLoginService
246 MapTileURL = mapTileURL; 246 MapTileURL = mapTileURL;
247 ProfileURL = profileURL; 247 ProfileURL = profileURL;
248 OpenIDURL = openIDURL; 248 OpenIDURL = openIDURL;
249 DestinationsURL = destinationsURL;
250 AvatarsURL = avatarsURL;
249 251
250 SearchURL = searchURL; 252 SearchURL = searchURL;
251 Currency = currency; 253 Currency = currency;
@@ -533,6 +535,12 @@ namespace OpenSim.Services.LLLoginService
533 if (profileURL != String.Empty) 535 if (profileURL != String.Empty)
534 responseData["profile-server-url"] = profileURL; 536 responseData["profile-server-url"] = profileURL;
535 537
538 if (DestinationsURL != String.Empty)
539 responseData["destination_guide_url"] = DestinationsURL;
540
541 if (AvatarsURL != String.Empty)
542 responseData["avatar_picker_url"] = AvatarsURL;
543
536 // We need to send an openid_token back in the response too 544 // We need to send an openid_token back in the response too
537 if (openIDURL != String.Empty) 545 if (openIDURL != String.Empty)
538 responseData["openid_url"] = openIDURL; 546 responseData["openid_url"] = openIDURL;
@@ -1056,6 +1064,16 @@ namespace OpenSim.Services.LLLoginService
1056 set { currency = value; } 1064 set { currency = value; }
1057 } 1065 }
1058 1066
1067 public string DestinationsURL
1068 {
1069 get; set;
1070 }
1071
1072 public string AvatarsURL
1073 {
1074 get; set;
1075 }
1076
1059 #endregion 1077 #endregion
1060 1078
1061 public class UserInfo 1079 public class UserInfo
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