1 files changed, 95 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index d862f18..553d057 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -141,20 +141,98 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags)
         {
+<<<<<<< HEAD
             List<MapBlockData> blocks = new List<MapBlockData>();
             if (mapName.Length < 3 || (mapName.EndsWith("#") && mapName.Length < 4))
+=======
+            Util.FireAndForget(x =>
+>>>>>>> avn/ubitvar
             {
+                List<MapBlockData> blocks = new List<MapBlockData>();
+                if (mapName.Length < 3 || (mapName.EndsWith("#") && mapName.Length < 4))
+                {
+                    // final block, closing the search result
+                    AddFinalBlock(blocks);
+
+                    // flags are agent flags sent from the viewer.
+                    // they have different values depending on different viewers, apparently
+                    remoteClient.SendMapBlock(blocks, flags);
+                    remoteClient.SendAlertMessage("Use a search string with at least 3 characters");
+                    return;
+                }
+
+                //m_log.DebugFormat("MAP NAME=({0})", mapName);
+
+                // Hack to get around the fact that ll V3 now drops the port from the
+                // map name. See https://jira.secondlife.com/browse/VWR-28570
+                //
+                // Caller, use this magic form instead:
+                // secondlife://http|!!mygrid.com|8002|Region+Name/128/128
+                // or url encode if possible.
+                // the hacks we do with this viewer...
+                //
+                string mapNameOrig = mapName;
+                if (mapName.Contains("|"))
+                    mapName = mapName.Replace('|', ':');
+                if (mapName.Contains("+"))
+                    mapName = mapName.Replace('+', ' ');
+                if (mapName.Contains("!"))
+                    mapName = mapName.Replace('!', '/');
+                
+                // try to fetch from GridServer
+                List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);
+    //            if (regionInfos.Count == 0)
+    //                remoteClient.SendAlertMessage("Hyperlink could not be established.");
+
+                //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
+ 
+                MapBlockData data;
+                if (regionInfos.Count > 0)
+                {
+                    foreach (GridRegion info in regionInfos)
+                    {
+                        data = new MapBlockData();
+                        data.Agents = 0;
+                        data.Access = info.Access;
+                        if (flags == 2) // V2 sends this
+                        {
+                            List<MapBlockData> datas = WorldMap.Map2BlockFromGridRegion(info, flags);
+                            // ugh! V2-3 is very sensitive about the result being
+                            // exactly the same as the requested name
+
+                            if (regionInfos.Count == 1 && (mapName != mapNameOrig))
+                                datas.ForEach(d => d.Name = mapNameOrig);
+
+                            blocks.AddRange(datas);                         
+                        }
+                        else
+                        {
+                            MapBlockData block = new MapBlockData();
+                            WorldMap.MapBlockFromGridRegion(block,info, flags);
+                            blocks.Add(block);
+                        }
+                        // ugh! V2-3 is very sensitive about the result being
+                        // exactly the same as the requested name
+                        if (regionInfos.Count == 1 && mapNameOrig.Contains("|") || mapNameOrig.Contains("+"))
+                            data.Name = mapNameOrig;
+                        else
+                            data.Name = info.RegionName;
+                        data.RegionFlags = 0; // TODO not used?
+                        data.WaterHeight = 0; // not used
+                        data.X = (ushort)(info.RegionLocX / Constants.RegionSize);
+                        data.Y = (ushort)(info.RegionLocY / Constants.RegionSize);
+                        blocks.Add(data);
+                    }
+                }
+
                 // final block, closing the search result
                 AddFinalBlock(blocks);
 
                 // flags are agent flags sent from the viewer.
                 // they have different values depending on different viewers, apparently
                 remoteClient.SendMapBlock(blocks, flags);
-                remoteClient.SendAlertMessage("Use a search string with at least 3 characters");
-                return;
-            }
-
 
+<<<<<<< HEAD
             List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);
             
             string mapNameOrig = mapName;
@@ -221,6 +299,19 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 //else if (regionInfos.Count == 1)
                 //    remoteClient.SendAlertMessage("Region found!");
             }
+=======
+                // send extra user messages for V3
+                // because the UI is very confusing
+                // while we don't fix the hard-coded urls
+                if (flags == 2) 
+                {
+                    if (regionInfos.Count == 0)
+                        remoteClient.SendAgentAlertMessage("No regions found with that name.", true);
+//                    else if (regionInfos.Count == 1)
+//                        remoteClient.SendAgentAlertMessage("Region found!", false);
+                }
+            });
+>>>>>>> avn/ubitvar
         }
 
         private void AddFinalBlock(List<MapBlockData> blocks)