Merge branch 'master' into httptests

3 files changed, 137 insertions, 78 deletions

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 7370156..b1234fe 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -128,104 +128,104 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 m_Clients.Add(remoteClient.AgentId);
             }
 
-            try
-            {
-                OnMapNameRequest(remoteClient, mapName, flags);
-            }
-            finally
-            {
-                lock (m_Clients)
-                    m_Clients.Remove(remoteClient.AgentId);
-            }
+            OnMapNameRequest(remoteClient, mapName, flags);
         }
 
         private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags)
         {
             Util.FireAndForget(x =>
             {
-                List<MapBlockData> blocks = new List<MapBlockData>();
-                if (mapName.Length < 3 || (mapName.EndsWith("#") && mapName.Length < 4))
+                try
                 {
-                    // final block, closing the search result
-                    AddFinalBlock(blocks,mapName);
+                    List<MapBlockData> blocks = new List<MapBlockData>();
+                    if (mapName.Length < 3 || (mapName.EndsWith("#") && mapName.Length < 4))
+                    {
+                        // final block, closing the search result
+                        AddFinalBlock(blocks,mapName);
 
-                    // 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;
-                }
+                        // 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);
+                    //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...
-                //
-                bool needOriginalName = false;
-                string mapNameOrig = mapName;
-                if (mapName.Contains("|"))
-                {
-                    mapName = mapName.Replace('|', ':');
-                    needOriginalName = true;
-                }
-                if (mapName.Contains("+"))
-                {
-                    mapName = mapName.Replace('+', ' ');
-                    needOriginalName = true;
-                }
-                if (mapName.Contains("!"))
-                {
-                    mapName = mapName.Replace('!', '/');
-                    needOriginalName = true;
-                }
-                if (mapName.Contains("."))
-                    needOriginalName = true;
+                    // 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...
+                    //
+                    bool needOriginalName = false;
+                    string mapNameOrig = mapName;
+                    if (mapName.Contains("|"))
+                    {
+                        mapName = mapName.Replace('|', ':');
+                        needOriginalName = true;
+                    }
+                    if (mapName.Contains("+"))
+                    {
+                        mapName = mapName.Replace('+', ' ');
+                        needOriginalName = true;
+                    }
+                    if (mapName.Contains("!"))
+                    {
+                        mapName = mapName.Replace('!', '/');
+                        needOriginalName = true;
+                    }
+                    if (mapName.Contains("."))
+                        needOriginalName = true;
 
-                // 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.");
+                    // 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);
+                    //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
  
-                MapBlockData data;
-                if (regionInfos.Count > 0)
-                {
-                    foreach (GridRegion info in regionInfos)
+                    MapBlockData data;
+                    if (regionInfos.Count > 0)
                     {
-                        data = new MapBlockData();
-                        data.Agents = 0;
-                        data.Access = info.Access;
-                        MapBlockData block = new MapBlockData();
-                        WorldMap.MapBlockFromGridRegion(block, info, flags);
+                        foreach (GridRegion info in regionInfos)
+                        {
+                            data = new MapBlockData();
+                            data.Agents = 0;
+                            data.Access = info.Access;
+                            MapBlockData block = new MapBlockData();
+                            WorldMap.MapBlockFromGridRegion(block, info, flags);
 
-                        if (flags == 2 &&  regionInfos.Count == 1 && needOriginalName)
-                                block.Name = mapNameOrig;
-                        blocks.Add(block);
+                            if (flags == 2 &&  regionInfos.Count == 1 && needOriginalName)
+                                    block.Name = mapNameOrig;
+                            blocks.Add(block);
+                        }
                     }
-                }
 
-                // final block, closing the search result
-                AddFinalBlock(blocks,mapNameOrig);
+                    // final block, closing the search result
+                        AddFinalBlock(blocks,mapNameOrig);
 
-                // flags are agent flags sent from the viewer.
-                // they have different values depending on different viewers, apparently
-                remoteClient.SendMapBlock(blocks, flags);
+                    // flags are agent flags sent from the viewer.
+                    // they have different values depending on different viewers, apparently
+                    remoteClient.SendMapBlock(blocks, flags);
 
-                // send extra user messages for V3
-                // because the UI is very confusing
-                // while we don't fix the hard-coded urls
-                if (flags == 2) 
+                    // 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);
+                    }
+                }
+                finally
                 {
-                    if (regionInfos.Count == 0)
-                        remoteClient.SendAgentAlertMessage("No regions found with that name.", true);
-//                    else if (regionInfos.Count == 1)
-//                        remoteClient.SendAgentAlertMessage("Region found!", false);
+                    lock (m_Clients)
+                        m_Clients.Remove(remoteClient.AgentId);
                 }
             });
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 849d02d..80bb461 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -13758,6 +13758,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             case ScriptBaseClass.OBJECT_LAST_OWNER_ID:
                                 ret.Add(new LSL_Key(ScriptBaseClass.NULL_KEY));
                                 break;
+                            case ScriptBaseClass.OBJECT_CLICK_ACTION:
+                                ret.Add(new LSL_Integer(0));
+                                break;
+                            case ScriptBaseClass.OBJECT_OMEGA:
+                                ret.Add(new LSL_Vector(Vector3.Zero));
+                                break;
+                            case ScriptBaseClass.OBJECT_PRIM_COUNT:
+                                List<SceneObjectGroup> Attachments = av.GetAttachments();
+                                int count = 0;
+                                try
+                                {
+                                    foreach (SceneObjectGroup Attachment in Attachments)
+                                        count += Attachment.PrimCount;
+                                } catch { };
+                                ret.Add(new LSL_Integer(count));
+                                break;
+                            case ScriptBaseClass.OBJECT_TOTAL_INVENTORY_COUNT:
+                                List<SceneObjectGroup> invAttachments = av.GetAttachments();
+                                int invcount = 0;
+                                try
+                                {
+                                    foreach (SceneObjectGroup Attachment in invAttachments)
+                                    {
+                                        SceneObjectPart[] parts = Attachment.Parts;
+                                        int nparts = parts.Count();
+                                        for(int i = 0; i < nparts; i++)
+                                            invcount += parts[i].Inventory.Count;
+                                    }
+                                } catch { };
+                                ret.Add(new LSL_Integer(invcount));
+                                break;
+                            case ScriptBaseClass.OBJECT_GROUP_TAG:
+                                ret.Add(new LSL_String(av.Grouptitle));
+                                break;
                             default:
                                 // Invalid or unhandled constant.
                                 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL));
@@ -13930,6 +13964,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             case ScriptBaseClass.OBJECT_LAST_OWNER_ID:
                                 ret.Add(new LSL_Key(obj.ParentGroup.LastOwnerID.ToString()));
                                 break;
+                            case ScriptBaseClass.OBJECT_CLICK_ACTION:
+                                ret.Add(new LSL_Integer(obj.ClickAction));
+                                break;
+                            case ScriptBaseClass.OBJECT_OMEGA:
+                                ret.Add(new LSL_Vector(obj.AngularVelocity));
+                                break;
+                            case ScriptBaseClass.OBJECT_PRIM_COUNT:
+                                ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount));
+                                break;
+                            case ScriptBaseClass.OBJECT_TOTAL_INVENTORY_COUNT:
+                                SceneObjectPart[] parts = obj.ParentGroup.Parts;
+                                int nparts = parts.Count();
+                                int count = 0;
+                                for(int i = 0; i < nparts; i++)
+                                    count += parts[i].Inventory.Count;
+                                ret.Add(new LSL_Integer(count));
+                                break;
+                            case ScriptBaseClass.OBJECT_GROUP_TAG:
+                                ret.Add(new LSL_String(String.Empty));
+                                break;
                             default:
                                 // Invalid or unhandled constant.
                                 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL));
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index cee66b2..17173a2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -636,6 +636,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int OBJECT_HOVER_HEIGHT = 25;
         public const int OBJECT_BODY_SHAPE_TYPE = 26;
         public const int OBJECT_LAST_OWNER_ID = 27;
+        public const int OBJECT_CLICK_ACTION = 28;
+        public const int OBJECT_OMEGA = 29;
+        public const int OBJECT_PRIM_COUNT = 30;
+        public const int OBJECT_TOTAL_INVENTORY_COUNT = 31;
+        public const int OBJECT_GROUP_TAG = 33;
 
         // Pathfinding types
         public const int OPT_OTHER = -1;