From c0a69bfaab2f945f2f871ce6b93c81931ffc2f9a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 8 May 2011 22:50:04 -0700
Subject: The map is seriously broken. This doesn't fix it, but at least
 provides one more piece of data that seems to be required -- agent flags,
 which seem to be different in Viewer 2. WARNING: changes IClientAPI.

---
 OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World')

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index f9ef286..c059a5f 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             client.OnMapNameRequest += OnMapNameRequest;
         }
 
-        private void OnMapNameRequest(IClientAPI remoteClient, string mapName)
+        private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags)
         {
             if (mapName.Length < 3)
             {
@@ -139,9 +139,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             data.Y = 0;
             blocks.Add(data);
 
-            // not sure what the flags do here, but seems to be necessary
-            // to set to "2" for viewer 2
-            remoteClient.SendMapBlock(blocks, 2);
+            // flags are agent flags sent from the viewer.
+            // they have different values depending on different viewers, apparently
+            remoteClient.SendMapBlock(blocks, flags);
         }
 
 //        private Scene GetClientScene(IClientAPI client)
-- 
cgit v1.1