diff options
author | Melanie | 2010-12-30 01:40:38 +0000 |
---|---|---|
committer | Melanie | 2010-12-30 01:40:38 +0000 |
commit | 3b50066ceb620ec00c50e3ea52be398e9914afdc (patch) | |
tree | af41bb529e93a0d2cf5e2ee002f0231d300c0d16 /OpenSim/Region/CoreModules/World | |
parent | Implement SendPlacesReply (diff) | |
parent | Implement SendPlacesReply (diff) | |
download | opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.zip opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.gz opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.bz2 opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index e3ba190..f9d28b9 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -148,7 +148,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
148 | 148 | ||
149 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); | 149 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); |
150 | regionimage = regionimage.Replace("-", ""); | 150 | regionimage = regionimage.Replace("-", ""); |
151 | m_log.Info("[WORLD MAP]: JPEG Map location: " + m_scene.RegionInfo.ServerURI + "/index.php?method=" + regionimage); | 151 | m_log.Info("[WORLD MAP]: JPEG Map location: " + m_scene.RegionInfo.ServerURI + "index.php?method=" + regionimage); |
152 | 152 | ||
153 | MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage); | 153 | MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage); |
154 | MainServer.Instance.AddLLSDHandler( | 154 | MainServer.Instance.AddLLSDHandler( |