diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Services/LLLoginService/LLLoginService.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 2941f51..fc45f86 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -131,7 +131,7 @@ namespace OpenSim.Services.LLLoginService | |||
131 | m_AllowedClients = Util.GetConfigVarFromSections<string>( | 131 | m_AllowedClients = Util.GetConfigVarFromSections<string>( |
132 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); | 132 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); |
133 | m_DeniedClients = Util.GetConfigVarFromSections<string>( | 133 | m_DeniedClients = Util.GetConfigVarFromSections<string>( |
134 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); | 134 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); |
135 | 135 | ||
136 | m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); | 136 | m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); |
137 | m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time"); | 137 | m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time"); |
@@ -180,13 +180,13 @@ namespace OpenSim.Services.LLLoginService | |||
180 | string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty); | 180 | string hgInvServicePlugin = m_LoginServerConfig.GetString("HGInventoryServicePlugin", String.Empty); |
181 | if (hgInvServicePlugin != string.Empty) | 181 | if (hgInvServicePlugin != string.Empty) |
182 | { | 182 | { |
183 | // TODO: Remove HGInventoryServiceConstructorArg after 0.9 release | 183 | // TODO: Remove HGInventoryServiceConstructorArg after 0.9 release |
184 | string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty); | 184 | string hgInvServiceArg = m_LoginServerConfig.GetString("HGInventoryServiceConstructorArg", String.Empty); |
185 | if (hgInvServiceArg != String.Empty) | 185 | if (hgInvServiceArg != String.Empty) |
186 | { | 186 | { |
187 | m_log.Warn("[LLOGIN SERVICE]: You are using HGInventoryServiceConstructorArg, which is deprecated. See example file for correct syntax."); | 187 | m_log.Warn("[LLOGIN SERVICE]: You are using HGInventoryServiceConstructorArg, which is deprecated. See example file for correct syntax."); |
188 | hgInvServicePlugin = hgInvServiceArg + "@" + hgInvServicePlugin; | 188 | hgInvServicePlugin = hgInvServiceArg + "@" + hgInvServicePlugin; |
189 | } | 189 | } |
190 | m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args); | 190 | m_HGInventoryService = ServerUtils.LoadPlugin<IInventoryService>(hgInvServicePlugin, args); |
191 | } | 191 | } |
192 | 192 | ||
@@ -270,7 +270,7 @@ namespace OpenSim.Services.LLLoginService | |||
270 | return response; | 270 | return response; |
271 | } | 271 | } |
272 | 272 | ||
273 | public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, | 273 | public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, |
274 | string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient) | 274 | string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient) |
275 | { | 275 | { |
276 | bool success = false; | 276 | bool success = false; |
@@ -283,7 +283,7 @@ namespace OpenSim.Services.LLLoginService | |||
283 | 283 | ||
284 | 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} ", | 284 | 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} ", |
285 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); | 285 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); |
286 | 286 | ||
287 | try | 287 | try |
288 | { | 288 | { |
289 | // | 289 | // |
@@ -452,7 +452,7 @@ namespace OpenSim.Services.LLLoginService | |||
452 | guinfo = new GridUserInfo(); | 452 | guinfo = new GridUserInfo(); |
453 | guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30); | 453 | guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30); |
454 | } | 454 | } |
455 | 455 | ||
456 | // | 456 | // |
457 | // Find the destination region/grid | 457 | // Find the destination region/grid |
458 | // | 458 | // |
@@ -494,7 +494,7 @@ namespace OpenSim.Services.LLLoginService | |||
494 | // | 494 | // |
495 | string reason = string.Empty; | 495 | string reason = string.Empty; |
496 | GridRegion dest; | 496 | GridRegion dest; |
497 | AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, | 497 | AgentCircuitData aCircuit = LaunchAgentAtGrid(gatekeeper, destination, account, avatar, session, secureSession, position, where, |
498 | clientVersion, channel, mac, id0, clientIP, flags, out where, out reason, out dest); | 498 | clientVersion, channel, mac, id0, clientIP, flags, out where, out reason, out dest); |
499 | destination = dest; | 499 | destination = dest; |
500 | if (aCircuit == null) | 500 | if (aCircuit == null) |
@@ -504,7 +504,7 @@ namespace OpenSim.Services.LLLoginService | |||
504 | return new LLFailedLoginResponse("key", reason, "false"); | 504 | return new LLFailedLoginResponse("key", reason, "false"); |
505 | 505 | ||
506 | } | 506 | } |
507 | // Get Friends list | 507 | // Get Friends list |
508 | FriendInfo[] friendsList = new FriendInfo[0]; | 508 | FriendInfo[] friendsList = new FriendInfo[0]; |
509 | if (m_FriendsService != null) | 509 | if (m_FriendsService != null) |
510 | { | 510 | { |
@@ -587,7 +587,7 @@ namespace OpenSim.Services.LLLoginService | |||
587 | lookAt = pinfo.HomeLookAt; | 587 | lookAt = pinfo.HomeLookAt; |
588 | flags |= TeleportFlags.ViaHome; | 588 | flags |= TeleportFlags.ViaHome; |
589 | } | 589 | } |
590 | 590 | ||
591 | if (tryDefaults) | 591 | if (tryDefaults) |
592 | { | 592 | { |
593 | List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID); | 593 | List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID); |
@@ -648,7 +648,7 @@ namespace OpenSim.Services.LLLoginService | |||
648 | position = pinfo.LastPosition; | 648 | position = pinfo.LastPosition; |
649 | lookAt = pinfo.LastLookAt; | 649 | lookAt = pinfo.LastLookAt; |
650 | } | 650 | } |
651 | 651 | ||
652 | return region; | 652 | return region; |
653 | } | 653 | } |
654 | else | 654 | else |
@@ -684,7 +684,7 @@ namespace OpenSim.Services.LLLoginService | |||
684 | regions = m_GridService.GetDefaultRegions(scopeID); | 684 | regions = m_GridService.GetDefaultRegions(scopeID); |
685 | if (regions != null && regions.Count > 0) | 685 | if (regions != null && regions.Count > 0) |
686 | { | 686 | { |
687 | where = "safe"; | 687 | where = "safe"; |
688 | return regions[0]; | 688 | return regions[0]; |
689 | } | 689 | } |
690 | else | 690 | else |
@@ -719,7 +719,7 @@ namespace OpenSim.Services.LLLoginService | |||
719 | return null; | 719 | return null; |
720 | } | 720 | } |
721 | // Valid specification of a remote grid | 721 | // Valid specification of a remote grid |
722 | 722 | ||
723 | regionName = parts[0]; | 723 | regionName = parts[0]; |
724 | string domainLocator = parts[1]; | 724 | string domainLocator = parts[1]; |
725 | parts = domainLocator.Split(new char[] {':'}); | 725 | parts = domainLocator.Split(new char[] {':'}); |
@@ -737,7 +737,7 @@ namespace OpenSim.Services.LLLoginService | |||
737 | List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID); | 737 | List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID); |
738 | if (defaults != null && defaults.Count > 0) | 738 | if (defaults != null && defaults.Count > 0) |
739 | { | 739 | { |
740 | where = "safe"; | 740 | where = "safe"; |
741 | return defaults[0]; | 741 | return defaults[0]; |
742 | } | 742 | } |
743 | else | 743 | else |
@@ -798,7 +798,7 @@ namespace OpenSim.Services.LLLoginService | |||
798 | string homeURI = null; | 798 | string homeURI = null; |
799 | if (account.ServiceURLs != null && account.ServiceURLs.ContainsKey("HomeURI")) | 799 | if (account.ServiceURLs != null && account.ServiceURLs.ContainsKey("HomeURI")) |
800 | homeURI = (string)account.ServiceURLs["HomeURI"]; | 800 | homeURI = (string)account.ServiceURLs["HomeURI"]; |
801 | 801 | ||
802 | GridRegion destination = m_GatekeeperConnector.GetHyperlinkRegion(gatekeeper, regionID, account.PrincipalID, homeURI, out message); | 802 | GridRegion destination = m_GatekeeperConnector.GetHyperlinkRegion(gatekeeper, regionID, account.PrincipalID, homeURI, out message); |
803 | return destination; | 803 | return destination; |
804 | } | 804 | } |
@@ -917,8 +917,8 @@ namespace OpenSim.Services.LLLoginService | |||
917 | return null; | 917 | return null; |
918 | } | 918 | } |
919 | 919 | ||
920 | private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, | 920 | private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, |
921 | AvatarAppearance avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, | 921 | AvatarAppearance avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, |
922 | string ipaddress, string viewer, string channel, string mac, string id0) | 922 | string ipaddress, string viewer, string channel, string mac, string id0) |
923 | { | 923 | { |
924 | AgentCircuitData aCircuit = new AgentCircuitData(); | 924 | AgentCircuitData aCircuit = new AgentCircuitData(); |
@@ -956,7 +956,7 @@ namespace OpenSim.Services.LLLoginService | |||
956 | if (account.ServiceURLs == null) | 956 | if (account.ServiceURLs == null) |
957 | return; | 957 | return; |
958 | 958 | ||
959 | // Old style: get the service keys from the DB | 959 | // Old style: get the service keys from the DB |
960 | foreach (KeyValuePair<string, object> kvp in account.ServiceURLs) | 960 | foreach (KeyValuePair<string, object> kvp in account.ServiceURLs) |
961 | { | 961 | { |
962 | if (kvp.Value != null) | 962 | if (kvp.Value != null) |
@@ -1053,7 +1053,7 @@ namespace OpenSim.Services.LLLoginService | |||
1053 | switch (subcommand) | 1053 | switch (subcommand) |
1054 | { | 1054 | { |
1055 | case "level": | 1055 | case "level": |
1056 | // Set the minimum level to allow login | 1056 | // Set the minimum level to allow login |
1057 | // Useful to allow grid update without worrying about users. | 1057 | // Useful to allow grid update without worrying about users. |
1058 | // or fixing critical issues | 1058 | // or fixing critical issues |
1059 | // | 1059 | // |