diff options
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index ba69e95..29199ae 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -77,6 +77,8 @@ namespace OpenSim.Services.LLLoginService | |||
77 | protected string m_GatekeeperURL; | 77 | protected string m_GatekeeperURL; |
78 | protected bool m_AllowRemoteSetLoginLevel; | 78 | protected bool m_AllowRemoteSetLoginLevel; |
79 | protected string m_MapTileURL; | 79 | protected string m_MapTileURL; |
80 | protected string m_ProfileURL; | ||
81 | protected string m_OpenIDURL; | ||
80 | protected string m_SearchURL; | 82 | protected string m_SearchURL; |
81 | protected string m_Currency; | 83 | protected string m_Currency; |
82 | protected string m_ClassifiedFee; | 84 | protected string m_ClassifiedFee; |
@@ -117,6 +119,8 @@ namespace OpenSim.Services.LLLoginService | |||
117 | m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", | 119 | m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
118 | new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty); | 120 | new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty); |
119 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 121 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); |
122 | m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty); | ||
123 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); | ||
120 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); | 124 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); |
121 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); | 125 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); |
122 | m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty); | 126 | m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty); |
@@ -262,13 +266,11 @@ namespace OpenSim.Services.LLLoginService | |||
262 | { | 266 | { |
263 | bool success = false; | 267 | bool success = false; |
264 | UUID session = UUID.Random(); | 268 | UUID session = UUID.Random(); |
265 | <<<<<<< HEAD | 269 | |
266 | string processedMessage; | 270 | string processedMessage; |
267 | ======= | 271 | |
268 | if (clientVersion.Contains("Radegast")) | 272 | if (clientVersion.Contains("Radegast")) |
269 | LibOMVclient = false; | 273 | LibOMVclient = false; |
270 | >>>>>>> avn/ubitvar | ||
271 | |||
272 | 274 | ||
273 | m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", | 275 | m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", |
274 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); | 276 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); |
@@ -522,19 +524,11 @@ namespace OpenSim.Services.LLLoginService | |||
522 | processedMessage = processedMessage.Replace("\\n", "\n").Replace("<USERNAME>", firstName + " " + lastName); | 524 | processedMessage = processedMessage.Replace("\\n", "\n").Replace("<USERNAME>", firstName + " " + lastName); |
523 | 525 | ||
524 | LLLoginResponse response | 526 | LLLoginResponse response |
525 | <<<<<<< HEAD | ||
526 | = new LLLoginResponse( | ||
527 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | ||
528 | where, startLocation, position, lookAt, gestures, processedMessage, home, clientIP, | ||
529 | m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone, | ||
530 | m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee, m_MaxAgentGroups); | ||
531 | ======= | ||
532 | = new LLLoginResponse( | 527 | = new LLLoginResponse( |
533 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 528 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
534 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, | 529 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, |
535 | m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, | 530 | m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, |
536 | m_DestinationGuide, m_AvatarPicker, realID, m_ClassifiedFee); | 531 | m_DestinationGuide, m_AvatarPicker, realID, m_ClassifiedFee,m_MaxAgentGroups); |
537 | >>>>>>> avn/ubitvar | ||
538 | 532 | ||
539 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); | 533 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); |
540 | 534 | ||