aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
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/VWoHTTP/VWoHTTPModule.cs
parentCreate a MainServer static class to access the regions server's HTTP server (diff)
downloadopensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.zip
opensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.gz
opensim-SC-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.bz2
opensim-SC-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/VWoHTTP/VWoHTTPModule.cs')
-rw-r--r--OpenSim/Client/VWoHTTP/VWoHTTPModule.cs6
1 files changed, 3 insertions, 3 deletions
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;
31using Nini.Config; 30using Nini.Config;
32using OpenMetaverse; 31using OpenMetaverse;
33using OpenSim.Client.VWoHTTP.ClientStack; 32using OpenSim.Client.VWoHTTP.ClientStack;
33using OpenSim.Framework;
34using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
35using OpenSim.Framework.Servers.HttpServer; 35using OpenSim.Framework.Servers.HttpServer;
36using OpenSim.Region.Framework.Interfaces; 36using 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()