diff options
author | Melanie | 2010-08-07 22:24:17 +0100 |
---|---|---|
committer | Melanie | 2010-08-07 22:24:17 +0100 |
commit | 4c5788c4c0975dbf3af58e2184a90965fcf0e893 (patch) | |
tree | 6a00001521ccae6c9fe23cf9a4f47ca75b3515cd /OpenSim/Services/LLLoginService/LLLoginResponse.cs | |
parent | Dumb error in fix (diff) | |
download | opensim-SC_OLD-4c5788c4c0975dbf3af58e2184a90965fcf0e893.zip opensim-SC_OLD-4c5788c4c0975dbf3af58e2184a90965fcf0e893.tar.gz opensim-SC_OLD-4c5788c4c0975dbf3af58e2184a90965fcf0e893.tar.bz2 opensim-SC_OLD-4c5788c4c0975dbf3af58e2184a90965fcf0e893.tar.xz |
Add search URL to Login Service
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginResponse.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 240f5b1..c1da463 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -178,6 +178,8 @@ namespace OpenSim.Services.LLLoginService | |||
178 | // Web map | 178 | // Web map |
179 | private string mapTileURL; | 179 | private string mapTileURL; |
180 | 180 | ||
181 | private string searchURL; | ||
182 | |||
181 | // Error Flags | 183 | // Error Flags |
182 | private string errorReason; | 184 | private string errorReason; |
183 | private string errorMessage; | 185 | private string errorMessage; |
@@ -226,7 +228,7 @@ namespace OpenSim.Services.LLLoginService | |||
226 | public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, | 228 | public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, |
227 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, | 229 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, |
228 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, | 230 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, |
229 | GridRegion home, IPEndPoint clientIP, string mapTileURL) | 231 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL) |
230 | : this() | 232 | : this() |
231 | { | 233 | { |
232 | FillOutInventoryData(invSkel, libService); | 234 | FillOutInventoryData(invSkel, libService); |
@@ -243,6 +245,7 @@ namespace OpenSim.Services.LLLoginService | |||
243 | BuddList = ConvertFriendListItem(friendsList); | 245 | BuddList = ConvertFriendListItem(friendsList); |
244 | StartLocation = where; | 246 | StartLocation = where; |
245 | MapTileURL = mapTileURL; | 247 | MapTileURL = mapTileURL; |
248 | SearchURL = searchURL; | ||
246 | 249 | ||
247 | FillOutHomeData(pinfo, home); | 250 | FillOutHomeData(pinfo, home); |
248 | LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); | 251 | LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); |
@@ -416,6 +419,7 @@ namespace OpenSim.Services.LLLoginService | |||
416 | InitialOutfitHash["gender"] = "female"; | 419 | InitialOutfitHash["gender"] = "female"; |
417 | initialOutfit.Add(InitialOutfitHash); | 420 | initialOutfit.Add(InitialOutfitHash); |
418 | mapTileURL = String.Empty; | 421 | mapTileURL = String.Empty; |
422 | searchURL = String.Empty; | ||
419 | } | 423 | } |
420 | 424 | ||
421 | 425 | ||
@@ -479,6 +483,9 @@ namespace OpenSim.Services.LLLoginService | |||
479 | responseData["region_x"] = (Int32)(RegionX); | 483 | responseData["region_x"] = (Int32)(RegionX); |
480 | responseData["region_y"] = (Int32)(RegionY); | 484 | responseData["region_y"] = (Int32)(RegionY); |
481 | 485 | ||
486 | if (searchURL != String.Empty) | ||
487 | responseData["search"] = searchURL; | ||
488 | |||
482 | if (mapTileURL != String.Empty) | 489 | if (mapTileURL != String.Empty) |
483 | responseData["map-server-url"] = mapTileURL; | 490 | responseData["map-server-url"] = mapTileURL; |
484 | 491 | ||
@@ -581,6 +588,9 @@ namespace OpenSim.Services.LLLoginService | |||
581 | if (mapTileURL != String.Empty) | 588 | if (mapTileURL != String.Empty) |
582 | map["map-server-url"] = OSD.FromString(mapTileURL); | 589 | map["map-server-url"] = OSD.FromString(mapTileURL); |
583 | 590 | ||
591 | if (searchURL != String.Empty) | ||
592 | map["search"] = OSD.FromString(searchURL); | ||
593 | |||
584 | if (m_buddyList != null) | 594 | if (m_buddyList != null) |
585 | { | 595 | { |
586 | map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); | 596 | map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); |
@@ -938,6 +948,12 @@ namespace OpenSim.Services.LLLoginService | |||
938 | set { mapTileURL = value; } | 948 | set { mapTileURL = value; } |
939 | } | 949 | } |
940 | 950 | ||
951 | public string SearchURL | ||
952 | { | ||
953 | get { return searchURL; } | ||
954 | set { searchURL = value; } | ||
955 | } | ||
956 | |||
941 | public string Message | 957 | public string Message |
942 | { | 958 | { |
943 | get { return welcomeMessage; } | 959 | get { return welcomeMessage; } |