diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Client/Linden/LLProxyLoginModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Client/VWoHTTP/VWoHTTPModule.cs | 6 |
3 files changed, 6 insertions, 6 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 |
diff --git a/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs b/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs index b1596be..31385ba 100644 --- a/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs +++ b/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs | |||
@@ -20,8 +20,7 @@ | |||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 25 | */ |
27 | 26 | ||
@@ -31,6 +30,7 @@ using System.Text; | |||
31 | using Nini.Config; | 30 | using Nini.Config; |
32 | using OpenMetaverse; | 31 | using OpenMetaverse; |
33 | using OpenSim.Client.VWoHTTP.ClientStack; | 32 | using OpenSim.Client.VWoHTTP.ClientStack; |
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Servers; | 34 | using OpenSim.Framework.Servers; |
35 | using OpenSim.Framework.Servers.HttpServer; | 35 | using OpenSim.Framework.Servers.HttpServer; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
@@ -57,7 +57,7 @@ namespace OpenSim.Client.VWoHTTP | |||
57 | 57 | ||
58 | m_scenes.Add(scene); | 58 | m_scenes.Add(scene); |
59 | 59 | ||
60 | m_httpd = scene.CommsManager.HttpServer; | 60 | m_httpd = MainServer.Instance; |
61 | } | 61 | } |
62 | 62 | ||
63 | public void PostInitialise() | 63 | public void PostInitialise() |