aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-05-09 10:25:42 -0700
committerDiva Canto2011-05-09 10:25:42 -0700
commit8a5f6dc7a534fcdcfc877a6eac2553b18532e760 (patch)
tree2c7e174769b0ca1f60102976a422747e13a29121
parentThe map is seriously broken. This doesn't fix it, but at least provides one m... (diff)
downloadopensim-SC_OLD-8a5f6dc7a534fcdcfc877a6eac2553b18532e760.zip
opensim-SC_OLD-8a5f6dc7a534fcdcfc877a6eac2553b18532e760.tar.gz
opensim-SC_OLD-8a5f6dc7a534fcdcfc877a6eac2553b18532e760.tar.bz2
opensim-SC_OLD-8a5f6dc7a534fcdcfc877a6eac2553b18532e760.tar.xz
Fixes gray tiles on map search for viewers 1.
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs7
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs7
3 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1635a2d..1da9d5e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1363,7 +1363,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1363 1363
1364 public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag) 1364 public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
1365 { 1365 {
1366
1367 MapBlockData[] mapBlocks2 = mapBlocks.ToArray(); 1366 MapBlockData[] mapBlocks2 = mapBlocks.ToArray();
1368 1367
1369 int maxsend = 10; 1368 int maxsend = 10;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index c059a5f..00959b0 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
106 else if (regionInfos.Count == 0 && mapName.StartsWith("http://")) 106 else if (regionInfos.Count == 0 && mapName.StartsWith("http://"))
107 remoteClient.SendAlertMessage("Hyperlink could not be established."); 107 remoteClient.SendAlertMessage("Hyperlink could not be established.");
108 108
109 m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count); 109 m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions. Flags={2}", mapName, regionInfos.Count, flags);
110 List<MapBlockData> blocks = new List<MapBlockData>(); 110 List<MapBlockData> blocks = new List<MapBlockData>();
111 111
112 MapBlockData data; 112 MapBlockData data;
@@ -117,7 +117,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
117 data = new MapBlockData(); 117 data = new MapBlockData();
118 data.Agents = 0; 118 data.Agents = 0;
119 data.Access = info.Access; 119 data.Access = info.Access;
120 data.MapImageId = UUID.Zero; // could use info.TerrainImage but it seems to break viewer2 120 if (flags == 2) // V2 sends this
121 data.MapImageId = UUID.Zero;
122 else
123 data.MapImageId = info.TerrainImage;
121 data.Name = info.RegionName; 124 data.Name = info.RegionName;
122 data.RegionFlags = 0; // TODO not used? 125 data.RegionFlags = 0; // TODO not used?
123 data.WaterHeight = 0; // not used 126 data.WaterHeight = 0; // not used
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 1094970..8073f2d 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -205,8 +205,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
205 { 205 {
206 //try 206 //try
207 //{ 207 //{
208 //m_log.DebugFormat("[MAPLAYER]: request: {0}, path: {1}, param: {2}, agent:{3}", 208 //m_log.DebugFormat("[MAPLAYER]: path: {0}, param: {1}, agent:{2}",
209 //request, path, param,agentID.ToString()); 209 // path, param, agentID.ToString());
210 210
211 // this is here because CAPS map requests work even beyond the 10,000 limit. 211 // this is here because CAPS map requests work even beyond the 10,000 limit.
212 ScenePresence avatarPresence = null; 212 ScenePresence avatarPresence = null;
@@ -784,7 +784,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
784 /// <param name="maxY"></param> 784 /// <param name="maxY"></param>
785 public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) 785 public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
786 { 786 {
787 if ((flag & 0x10000) != 0) // user clicked on the map a tile that isn't visible 787 //m_log.ErrorFormat("[YYY] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
788 if ((flag & 0x10000) != 0) // user clicked on qthe map a tile that isn't visible
788 { 789 {
789 List<MapBlockData> response = new List<MapBlockData>(); 790 List<MapBlockData> response = new List<MapBlockData>();
790 791