aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Linden
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-10 02:22:26 +0000
committerMelanie Thielker2009-07-10 02:22:26 +0000
commitc310fb11f492419de60b4bf8e5bb234e4589b336 (patch)
treea7bccfad7cde51ec830fdad59d5729091b2e69ae /OpenSim/Client/Linden
parentCreate a MainServer static class to access the regions server's HTTP server (diff)
downloadopensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.zip
opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.gz
opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.bz2
opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.xz
Remove all references to HttpServer from CommsManager (all incarnations)
Change all uses of the HttpServer properties to use the new singleton
Diffstat (limited to 'OpenSim/Client/Linden')
-rw-r--r--OpenSim/Client/Linden/LLProxyLoginModule.cs4
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginModule.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs
index 88b7972..f7608d1 100644
--- a/OpenSim/Client/Linden/LLProxyLoginModule.cs
+++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs
@@ -143,8 +143,8 @@ namespace OpenSim.Client.Linden
143 protected void AddHttpHandlers() 143 protected void AddHttpHandlers()
144 { 144 {
145 //we will add our handlers to the first scene we received, as all scenes share a http server. But will this ever change? 145 //we will add our handlers to the first scene we received, as all scenes share a http server. But will this ever change?
146 m_firstScene.CommsManager.HttpServer.AddXmlRPCHandler("expect_user", ExpectUser); 146 MainServer.Instance.AddXmlRPCHandler("expect_user", ExpectUser);
147 m_firstScene.CommsManager.HttpServer.AddXmlRPCHandler("logoff_user", LogOffUser); 147 MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser);
148 } 148 }
149 149
150 protected void AddScene(Scene scene) 150 protected void AddScene(Scene scene)
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index 02a3b37..21197f8 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Client.Linden
130 LibraryRootFolder rootFolder 130 LibraryRootFolder rootFolder
131 = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder; 131 = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder;
132 132
133 IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; 133 IHttpServer httpServer = MainServer.Instance;
134 134
135 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference 135 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
136 m_loginService 136 m_loginService