aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
authorMelanie2010-08-07 22:24:17 +0100
committerMelanie2010-08-07 22:25:29 +0100
commitab5a461c5c2307bdef6924492eae76b6bbd86f62 (patch)
tree029dffe885b9f34df6bcb147544eb954ce9ccf57 /OpenSim/Services/LLLoginService/LLLoginService.cs
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
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs4
1 files changed, 3 insertions, 1 deletions
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;