diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Services/LLLoginService/LLLoginService.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index ede2353..ed62c43 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -50,6 +50,8 @@ namespace OpenSim.Services.LLLoginService | |||
50 | public class LLLoginService : ILoginService | 50 | public class LLLoginService : ILoginService |
51 | { | 51 | { |
52 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 52 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
53 | private static readonly string LogHeader = "[LLOGIN SERVICE]"; | ||
54 | |||
53 | private static bool Initialized = false; | 55 | private static bool Initialized = false; |
54 | 56 | ||
55 | protected IUserAccountService m_UserAccountService; | 57 | protected IUserAccountService m_UserAccountService; |
@@ -78,6 +80,9 @@ namespace OpenSim.Services.LLLoginService | |||
78 | protected string m_OpenIDURL; | 80 | protected string m_OpenIDURL; |
79 | protected string m_SearchURL; | 81 | protected string m_SearchURL; |
80 | protected string m_Currency; | 82 | protected string m_Currency; |
83 | protected string m_ClassifiedFee; | ||
84 | protected string m_DestinationGuide; | ||
85 | protected string m_AvatarPicker; | ||
81 | 86 | ||
82 | protected string m_AllowedClients; | 87 | protected string m_AllowedClients; |
83 | protected string m_DeniedClients; | 88 | protected string m_DeniedClients; |
@@ -117,6 +122,9 @@ namespace OpenSim.Services.LLLoginService | |||
117 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); | 122 | m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty); |
118 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); | 123 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); |
119 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); | 124 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); |
125 | m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty); | ||
126 | m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty); | ||
127 | m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty); | ||
120 | 128 | ||
121 | m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); | 129 | m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); |
122 | m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); | 130 | m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); |
@@ -391,6 +399,7 @@ namespace OpenSim.Services.LLLoginService | |||
391 | if (guinfo == null) | 399 | if (guinfo == null) |
392 | { | 400 | { |
393 | // something went wrong, make something up, so that we don't have to test this anywhere else | 401 | // something went wrong, make something up, so that we don't have to test this anywhere else |
402 | m_log.DebugFormat("{0} Failed to fetch GridUserInfo. Creating empty GridUserInfo as home", LogHeader); | ||
394 | guinfo = new GridUserInfo(); | 403 | guinfo = new GridUserInfo(); |
395 | guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30); | 404 | guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30); |
396 | } | 405 | } |
@@ -461,7 +470,8 @@ namespace OpenSim.Services.LLLoginService | |||
461 | = new LLLoginResponse( | 470 | = new LLLoginResponse( |
462 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 471 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
463 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, | 472 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, |
464 | m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, realID); | 473 | m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, |
474 | m_DestinationGuide, m_AvatarPicker, realID, m_ClassifiedFee); | ||
465 | 475 | ||
466 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); | 476 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); |
467 | 477 | ||
@@ -934,7 +944,7 @@ namespace OpenSim.Services.LLLoginService | |||
934 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) | 944 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) |
935 | { | 945 | { |
936 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); | 946 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); |
937 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, clientIP, out reason)) | 947 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, true, out reason)) |
938 | return true; | 948 | return true; |
939 | return false; | 949 | return false; |
940 | } | 950 | } |