From 623f57deb5a177afe444924a465861f7df90a6b5 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 6 Oct 2010 03:51:55 +0100
Subject: Change the URL /worldview to /worldview/<region id> to support
 multiregion

---
 OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs     | 3 ++-
 .../Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/World')

diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
index bcf4187..55be9ba 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
@@ -81,7 +81,8 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
             m_log.Info("[WORLDVIEW]: Configured and enabled");
 
             IHttpServer server = MainServer.GetHttpServer(0);
-            server.AddStreamHandler(new WorldViewRequestHandler(this));
+            server.AddStreamHandler(new WorldViewRequestHandler(this,
+                    scene.RegionInfo.RegionID.ToString()));
         }
 
         public void RemoveRegion(Scene scene)
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
index 8b2fa29..5e744bf 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
@@ -49,8 +49,8 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
         protected WorldViewModule m_WorldViewModule;
         protected Object m_RequestLock = new Object();
 
-        public WorldViewRequestHandler(WorldViewModule fmodule)
-                : base("POST", "/worldview")
+        public WorldViewRequestHandler(WorldViewModule fmodule, string rid)
+                : base("POST", "/worldview/" + rid)
         {
             m_WorldViewModule = fmodule;
         }
-- 
cgit v1.1