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/LLLoginResponse.cs | |
parent | Guard the scene list when estates are updated (diff) | |
download | opensim-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.cs | 20 |
1 files changed, 19 insertions, 1 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 |