diff options
author | Melanie | 2010-10-06 03:51:55 +0100 |
---|---|---|
committer | Melanie | 2010-10-06 03:51:55 +0100 |
commit | 623f57deb5a177afe444924a465861f7df90a6b5 (patch) | |
tree | baa0dbf93f175d52a2f3b1721009bdda2df73870 /OpenSim | |
parent | Convert the BMP to a JPEG image and return it. This should be testable. (diff) | |
download | opensim-SC-623f57deb5a177afe444924a465861f7df90a6b5.zip opensim-SC-623f57deb5a177afe444924a465861f7df90a6b5.tar.gz opensim-SC-623f57deb5a177afe444924a465861f7df90a6b5.tar.bz2 opensim-SC-623f57deb5a177afe444924a465861f7df90a6b5.tar.xz |
Change the URL /worldview to /worldview/<region id> to support multiregion
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs | 4 |
2 files changed, 4 insertions, 3 deletions
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 | |||
81 | m_log.Info("[WORLDVIEW]: Configured and enabled"); | 81 | m_log.Info("[WORLDVIEW]: Configured and enabled"); |
82 | 82 | ||
83 | IHttpServer server = MainServer.GetHttpServer(0); | 83 | IHttpServer server = MainServer.GetHttpServer(0); |
84 | server.AddStreamHandler(new WorldViewRequestHandler(this)); | 84 | server.AddStreamHandler(new WorldViewRequestHandler(this, |
85 | scene.RegionInfo.RegionID.ToString())); | ||
85 | } | 86 | } |
86 | 87 | ||
87 | public void RemoveRegion(Scene scene) | 88 | 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 | |||
49 | protected WorldViewModule m_WorldViewModule; | 49 | protected WorldViewModule m_WorldViewModule; |
50 | protected Object m_RequestLock = new Object(); | 50 | protected Object m_RequestLock = new Object(); |
51 | 51 | ||
52 | public WorldViewRequestHandler(WorldViewModule fmodule) | 52 | public WorldViewRequestHandler(WorldViewModule fmodule, string rid) |
53 | : base("POST", "/worldview") | 53 | : base("POST", "/worldview/" + rid) |
54 | { | 54 | { |
55 | m_WorldViewModule = fmodule; | 55 | m_WorldViewModule = fmodule; |
56 | } | 56 | } |