aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-08-07 22:24:17 +0100
committerMelanie2010-08-07 22:25:29 +0100
commitab5a461c5c2307bdef6924492eae76b6bbd86f62 (patch)
tree029dffe885b9f34df6bcb147544eb954ce9ccf57
parentminor: Remove overly verbose schedule full update log message for attachments (diff)
downloadopensim-SC_OLD-ab5a461c5c2307bdef6924492eae76b6bbd86f62.zip
opensim-SC_OLD-ab5a461c5c2307bdef6924492eae76b6bbd86f62.tar.gz
opensim-SC_OLD-ab5a461c5c2307bdef6924492eae76b6bbd86f62.tar.bz2
opensim-SC_OLD-ab5a461c5c2307bdef6924492eae76b6bbd86f62.tar.xz
Add search URL to Login Service
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs18
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs4
2 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 3366922..a01ea1e 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -173,6 +173,8 @@ namespace OpenSim.Services.LLLoginService
173 // Web map 173 // Web map
174 private string mapTileURL; 174 private string mapTileURL;
175 175
176 private string searchURL;
177
176 // Error Flags 178 // Error Flags
177 private string errorReason; 179 private string errorReason;
178 private string errorMessage; 180 private string errorMessage;
@@ -221,7 +223,7 @@ namespace OpenSim.Services.LLLoginService
221 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, 223 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
222 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 224 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
223 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, 225 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
224 GridRegion home, IPEndPoint clientIP, string mapTileURL) 226 GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL)
225 : this() 227 : this()
226 { 228 {
227 FillOutInventoryData(invSkel, libService); 229 FillOutInventoryData(invSkel, libService);
@@ -238,6 +240,7 @@ namespace OpenSim.Services.LLLoginService
238 BuddList = ConvertFriendListItem(friendsList); 240 BuddList = ConvertFriendListItem(friendsList);
239 StartLocation = where; 241 StartLocation = where;
240 MapTileURL = mapTileURL; 242 MapTileURL = mapTileURL;
243 SearchURL = searchURL;
241 244
242 FillOutHomeData(pinfo, home); 245 FillOutHomeData(pinfo, home);
243 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); 246 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@@ -410,6 +413,7 @@ namespace OpenSim.Services.LLLoginService
410 InitialOutfitHash["gender"] = "female"; 413 InitialOutfitHash["gender"] = "female";
411 initialOutfit.Add(InitialOutfitHash); 414 initialOutfit.Add(InitialOutfitHash);
412 mapTileURL = String.Empty; 415 mapTileURL = String.Empty;
416 searchURL = String.Empty;
413 } 417 }
414 418
415 419
@@ -473,6 +477,9 @@ namespace OpenSim.Services.LLLoginService
473 responseData["region_x"] = (Int32)(RegionX); 477 responseData["region_x"] = (Int32)(RegionX);
474 responseData["region_y"] = (Int32)(RegionY); 478 responseData["region_y"] = (Int32)(RegionY);
475 479
480 if (searchURL != String.Empty)
481 responseData["search"] = searchURL;
482
476 if (mapTileURL != String.Empty) 483 if (mapTileURL != String.Empty)
477 responseData["map-server-url"] = mapTileURL; 484 responseData["map-server-url"] = mapTileURL;
478 485
@@ -575,6 +582,9 @@ namespace OpenSim.Services.LLLoginService
575 if (mapTileURL != String.Empty) 582 if (mapTileURL != String.Empty)
576 map["map-server-url"] = OSD.FromString(mapTileURL); 583 map["map-server-url"] = OSD.FromString(mapTileURL);
577 584
585 if (searchURL != String.Empty)
586 map["search"] = OSD.FromString(searchURL);
587
578 if (m_buddyList != null) 588 if (m_buddyList != null)
579 { 589 {
580 map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray()); 590 map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
@@ -932,6 +942,12 @@ namespace OpenSim.Services.LLLoginService
932 set { mapTileURL = value; } 942 set { mapTileURL = value; }
933 } 943 }
934 944
945 public string SearchURL
946 {
947 get { return searchURL; }
948 set { searchURL = value; }
949 }
950
935 public string Message 951 public string Message
936 { 952 {
937 get { return welcomeMessage; } 953 get { return welcomeMessage; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 036bec6..f942070 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -74,6 +74,7 @@ namespace OpenSim.Services.LLLoginService
74 protected string m_GatekeeperURL; 74 protected string m_GatekeeperURL;
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 78
78 IConfig m_LoginServerConfig; 79 IConfig m_LoginServerConfig;
79 80
@@ -102,6 +103,7 @@ namespace OpenSim.Services.LLLoginService
102 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0); 103 m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
103 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty); 104 m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
104 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); 105 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
106 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
105 107
106 // These are required; the others aren't 108 // These are required; the others aren't
107 if (accountService == string.Empty || authService == string.Empty) 109 if (accountService == string.Empty || authService == string.Empty)
@@ -358,7 +360,7 @@ namespace OpenSim.Services.LLLoginService
358 // Finally, fill out the response and return it 360 // Finally, fill out the response and return it
359 // 361 //
360 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 362 LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
361 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL); 363 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL, m_SearchURL);
362 364
363 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client."); 365 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
364 return response; 366 return response;