diff options
| author | Jonathan Freedman | 2010-10-22 18:34:50 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-22 18:34:50 -0400 |
| commit | 38e76d71ac8d60ca5228588d154b610857381a1c (patch) | |
| tree | 45a9cccf38765e8b6c41547373bdcaa91d01508f /OpenSim/Region/CoreModules/World | |
| parent | Fix llParcelMediaCommandList() so that it applies commands only to the parcel... (diff) | |
| parent | * change the data exchanged within hypergrid transactions (diff) | |
| download | opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.zip opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.gz opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.bz2 opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.xz | |
Merge branch 'hg16' into mantis5110
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index a182eea..fdbbccf 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
| @@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 147 | 147 | ||
| 148 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); | 148 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); |
| 149 | regionimage = regionimage.Replace("-", ""); | 149 | regionimage = regionimage.Replace("-", ""); |
| 150 | m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); | 150 | m_log.Info("[WORLD MAP]: JPEG Map location: " + m_scene.RegionInfo.ServerURI + "/index.php?method=" + regionimage); |
| 151 | 151 | ||
| 152 | MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage); | 152 | MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage); |
| 153 | MainServer.Instance.AddLLSDHandler( | 153 | MainServer.Instance.AddLLSDHandler( |
| @@ -579,7 +579,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 579 | 579 | ||
| 580 | if (mreg != null) | 580 | if (mreg != null) |
| 581 | { | 581 | { |
| 582 | httpserver = "http://" + mreg.ExternalEndPoint.Address.ToString() + ":" + mreg.HttpPort + "/MAP/MapItems/" + regionhandle.ToString(); | 582 | httpserver = mreg.ServerURI + "MAP/MapItems/" + regionhandle.ToString(); |
| 583 | lock (m_cachedRegionMapItemsAddress) | 583 | lock (m_cachedRegionMapItemsAddress) |
| 584 | { | 584 | { |
| 585 | if (!m_cachedRegionMapItemsAddress.ContainsKey(regionhandle)) | 585 | if (!m_cachedRegionMapItemsAddress.ContainsKey(regionhandle)) |