diff options
author | BlueWall | 2014-09-03 17:00:03 -0400 |
---|---|---|
committer | BlueWall | 2014-09-03 17:09:57 -0400 |
commit | e19d1ecce8a5e1ca921323fa9e4f92ebfba73725 (patch) | |
tree | 3cd25adc0490eb8e510330d35a16376ce35f701b /OpenSim | |
parent | Don't show the ScrLPS data twice in the WebStats based statistics page. (diff) | |
download | opensim-SC-e19d1ecce8a5e1ca921323fa9e4f92ebfba73725.zip opensim-SC-e19d1ecce8a5e1ca921323fa9e4f92ebfba73725.tar.gz opensim-SC-e19d1ecce8a5e1ca921323fa9e4f92ebfba73725.tar.bz2 opensim-SC-e19d1ecce8a5e1ca921323fa9e4f92ebfba73725.tar.xz |
Cleanup some unused code and configuration entries
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index e67ecf0..27376cc 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -227,7 +227,7 @@ namespace OpenSim.Services.LLLoginService | |||
227 | public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, | 227 | public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, |
228 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, | 228 | GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, |
229 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, | 229 | string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, |
230 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, | 230 | GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency, |
231 | string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee) | 231 | string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee) |
232 | : this() | 232 | : this() |
233 | { | 233 | { |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 0ad9f92..8059652 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -77,8 +77,6 @@ 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; | ||
82 | protected string m_SearchURL; | 80 | protected string m_SearchURL; |
83 | protected string m_Currency; | 81 | protected string m_Currency; |
84 | protected string m_ClassifiedFee; | 82 | protected string m_ClassifiedFee; |
@@ -119,8 +117,6 @@ namespace OpenSim.Services.LLLoginService | |||
119 | m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", | 117 | m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
120 | new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty); | 118 | new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty); |
121 | m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); | 119 | 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); | ||
124 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); | 120 | m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); |
125 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); | 121 | m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); |
126 | m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty); | 122 | m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty); |
@@ -498,7 +494,7 @@ namespace OpenSim.Services.LLLoginService | |||
498 | = new LLLoginResponse( | 494 | = new LLLoginResponse( |
499 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, | 495 | account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, |
500 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, | 496 | where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, |
501 | m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, | 497 | m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone, |
502 | m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee); | 498 | m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee); |
503 | 499 | ||
504 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); | 500 | m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); |