aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/WorldMap
diff options
context:
space:
mode:
authorMW2008-06-25 19:33:19 +0000
committerMW2008-06-25 19:33:19 +0000
commit7a9922af27658ac570517df530dd7c2cf6d6dded (patch)
treef086664feaf6e917184b929bfc111e901f4359bc /OpenSim/Region/Environment/Modules/World/WorldMap
parentmake lots of properties virtual, which lets nhibernate do (diff)
downloadopensim-SC-7a9922af27658ac570517df530dd7c2cf6d6dded.zip
opensim-SC-7a9922af27658ac570517df530dd7c2cf6d6dded.tar.gz
opensim-SC-7a9922af27658ac570517df530dd7c2cf6d6dded.tar.bz2
opensim-SC-7a9922af27658ac570517df530dd7c2cf6d6dded.tar.xz
Added support for terrain map to be serialised to xml(as base64 binary). useful for places that the terrain map is needed in a serialised form. Also could add console commands to save and load from files, which should be faster than .raw files (these load/save commands are not included/implemented)
Add util functions to compress and uncompress strings. Fixed a couple of modules so they use SceneCommunicationService rather than directly call functions on the CommsManager.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/WorldMap')
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
index c8d2ef6..5287517 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
166 { 166 {
167 List<MapBlockData> mapBlocks; 167 List<MapBlockData> mapBlocks;
168 168
169 mapBlocks = m_scene.CommsManager.GridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8); 169 mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8);
170 avatarPresence.ControllingClient.SendMapBlock(mapBlocks); 170 avatarPresence.ControllingClient.SendMapBlock(mapBlocks);
171 171
172 lock (cachedMapBlocks) 172 lock (cachedMapBlocks)
@@ -244,7 +244,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
244 public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY) 244 public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
245 { 245 {
246 List<MapBlockData> mapBlocks; 246 List<MapBlockData> mapBlocks;
247 mapBlocks = m_scene.CommsManager.GridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4); 247 mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4);
248 remoteClient.SendMapBlock(mapBlocks); 248 remoteClient.SendMapBlock(mapBlocks);
249 } 249 }
250 public Hashtable OnHTTPGetMapImage(Hashtable keysvals) 250 public Hashtable OnHTTPGetMapImage(Hashtable keysvals)