Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

10 files changed, 482 insertions, 145 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 2154827..ac22c3f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -124,15 +124,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     "Archiving", this, "save iar",
                     "save iar [-h|--home=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [-c|--creators] [-v|--verbose]",
                     "Save user inventory archive (IAR).", 
-                    "<first> is the user's first name." + Environment.NewLine
-                    + "<last> is the user's last name." + Environment.NewLine
-                    + "<inventory path> is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine
-                    + "-h|--home=<url> adds the url of the profile service to the saved user information." + Environment.NewLine
-                    + "-c|--creators preserves information about foreign creators." + Environment.NewLine
-                    + "-v|--verbose extra debug messages." + Environment.NewLine
-                    + "--noassets stops assets being saved to the IAR."
+                    "<first> is the user's first name.\n"
+                    + "<last> is the user's last name.\n"
+                    + "<inventory path> is the path inside the user's inventory for the folder/item to be saved.\n"
                     + "<IAR path> is the filesystem path at which to save the IAR."
-                    + string.Format("  If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME),
+                    + string.Format("  If this is not given then the filename {0} in the current directory is used.\n", DEFAULT_INV_BACKUP_FILENAME)
+                    + "-h|--home=<url> adds the url of the profile service to the saved user information.\n"
+                    + "-c|--creators preserves information about foreign creators.\n"
+                    + "-v|--verbose extra debug messages.\n"
+                    + "--noassets stops assets being saved to the IAR.",
                     HandleSaveInvConsoleCommand);
 
                 m_aScene = scene;
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
new file mode 100644
index 0000000..8077a7a
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors.Hypergrid;
+
+using OpenMetaverse;
+using OpenMetaverse.Packets;
+using log4net;
+using Nini.Config;
+
+namespace OpenSim.Region.CoreModules.Framework.UserManagement
+{
+    public class HGUserManagementModule : UserManagementModule, ISharedRegionModule, IUserManagement
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+
+        #region ISharedRegionModule
+
+        public new void Initialise(IConfigSource config)
+        {
+            string umanmod = config.Configs["Modules"].GetString("UserManagementModule", base.Name);
+            if (umanmod == Name)
+            {
+                m_Enabled = true;
+                RegisterConsoleCmds();
+                m_log.DebugFormat("[USER MANAGEMENT MODULE]: {0} is enabled", Name);
+            }
+        }
+
+        public override string Name
+        {
+            get { return "HGUserManagementModule"; }
+        }
+
+        #endregion ISharedRegionModule
+
+        protected override void AddAdditionalUsers(UUID avatarID, string query, List<UserData> users)
+        {
+            string[] words = query.Split(new char[] { ' ' });
+
+            for (int i = 0; i < words.Length; i++)
+            {
+                if (words[i].Length < 3)
+                {
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+                    Array.Resize(ref words, words.Length - 1);
+                }
+            }
+
+            if (words.Length == 0 || words.Length > 2)
+                return;
+
+            if (words.Length == 2)  // First.Last @foo.com, maybe?
+            {
+                bool found = false;
+                foreach (UserData d in m_UserCache.Values)
+                {
+                    if (d.LastName.StartsWith("@") && 
+                        (d.FirstName.ToLower().Equals(words[0].ToLower()) ||
+                         d.LastName.ToLower().Equals(words[1].ToLower())))
+                    {
+                        users.Add(d);
+                        found = true;
+                        break;
+                    }
+                }
+                if (!found) // This is it! Let's ask the other world
+                {
+                    // TODO
+                    //UserAgentServiceConnector uasConn = new UserAgentServiceConnector(words[0]);
+                    //uasConn.GetUserInfo(...);
+                }
+            }
+            else
+            {
+                foreach (UserData d in m_UserCache.Values)
+                {
+                    if (d.LastName.StartsWith("@") && 
+                        (d.FirstName.ToLower().StartsWith(query.ToLower()) || 
+                         d.LastName.ToLower().StartsWith(query.ToLower())))
+                        users.Add(d);
+                }
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 554af14..23ef0fc 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -38,12 +38,13 @@ using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors.Hypergrid;
 
 using OpenMetaverse;
+using OpenMetaverse.Packets;
 using log4net;
 using Nini.Config;
 
 namespace OpenSim.Region.CoreModules.Framework.UserManagement
 {
-    class UserData
+    public class UserData
     {
         public UUID Id { get; set; }
         public string FirstName { get; set; }
@@ -56,36 +57,23 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private List<Scene> m_Scenes = new List<Scene>();
+        protected bool m_Enabled;
+        protected List<Scene> m_Scenes = new List<Scene>();
 
         // The cache
-        Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
+        protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
 
         #region ISharedRegionModule
 
         public void Initialise(IConfigSource config)
         {
-            //m_Enabled = config.Configs["Modules"].GetBoolean("LibraryModule", m_Enabled);
-            //if (m_Enabled)
-            //{
-            //    IConfig libConfig = config.Configs["LibraryService"];
-            //    if (libConfig != null)
-            //    {
-            //        string dllName = libConfig.GetString("LocalServiceModule", string.Empty);
-            //        m_log.Debug("[LIBRARY MODULE]: Library service dll is " + dllName);
-            //        if (dllName != string.Empty)
-            //        {
-            //            Object[] args = new Object[] { config };
-            //            m_Library = ServerUtils.LoadPlugin<ILibraryService>(dllName, args);
-            //        }
-            //    }
-            //}
-            MainConsole.Instance.Commands.AddCommand("Users", true,
-                "show names",
-                "show names",
-                "Show the bindings between user UUIDs and user names",
-                String.Empty,
-                HandleShowUsers);
+            string umanmod = config.Configs["Modules"].GetString("UserManagementModule", Name);
+            if (umanmod == Name)
+            {
+                m_Enabled = true;
+                RegisterConsoleCmds();
+                m_log.DebugFormat("[USER MANAGEMENT MODULE]: {0} is enabled", Name);
+            }
         }
 
         public bool IsSharedModule
@@ -93,9 +81,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             get { return true; }
         }
 
-        public string Name
+        public virtual string Name
         {
-            get { return "UserManagement Module"; }
+            get { return "BasicUserManagementModule"; }
         }
 
         public Type ReplaceableInterface
@@ -105,17 +93,23 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public void AddRegion(Scene scene)
         {
-            m_Scenes.Add(scene);
+            if (m_Enabled)
+            {
+                m_Scenes.Add(scene);
 
-            scene.RegisterModuleInterface<IUserManagement>(this);
-            scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient);
-            scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded);
+                scene.RegisterModuleInterface<IUserManagement>(this);
+                scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient);
+                scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded);
+            }
         }
 
         public void RemoveRegion(Scene scene)
         {
-            scene.UnregisterModuleInterface<IUserManagement>(this);
-            m_Scenes.Remove(scene);
+            if (m_Enabled)
+            {
+                scene.UnregisterModuleInterface<IUserManagement>(this);
+                m_Scenes.Remove(scene);
+            }
         }
 
         public void RegionLoaded(Scene s)
@@ -149,7 +143,15 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         void EventManager_OnNewClient(IClientAPI client)
         {
+            client.OnConnectionClosed += new Action<IClientAPI>(HandleConnectionClosed);
             client.OnNameFromUUIDRequest += new UUIDNameRequest(HandleUUIDNameRequest);
+            client.OnAvatarPickerRequest += new AvatarPickerRequest(HandleAvatarPickerRequest);
+        }
+
+        void HandleConnectionClosed(IClientAPI client)
+        {
+            client.OnNameFromUUIDRequest -= new UUIDNameRequest(HandleUUIDNameRequest);
+            client.OnAvatarPickerRequest -= new AvatarPickerRequest(HandleAvatarPickerRequest);
         }
 
         void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
@@ -170,6 +172,78 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
         }
 
+        public void HandleAvatarPickerRequest(IClientAPI client, UUID avatarID, UUID RequestID, string query)
+        {
+            //EventManager.TriggerAvatarPickerRequest();
+
+            m_log.DebugFormat("[USER MANAGEMENT MODULE]: HandleAvatarPickerRequest for {0}", query);
+
+            List<UserAccount> accs = m_Scenes[0].UserAccountService.GetUserAccounts(m_Scenes[0].RegionInfo.ScopeID, query);
+
+            List<UserData> users = new List<UserData>();
+            if (accs != null)
+            {
+                m_log.DebugFormat("[USER MANAGEMENT MODULE]: Found {0} users", accs.Count);
+                foreach (UserAccount acc in accs)
+                {
+                    UserData ud = new UserData();
+                    ud.FirstName = acc.FirstName;
+                    ud.LastName = acc.LastName;
+                    ud.Id = acc.PrincipalID;
+                    users.Add(ud);
+                }
+            }
+
+            AddAdditionalUsers(avatarID, query, users);
+
+            AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply);
+            // TODO: don't create new blocks if recycling an old packet
+
+            AvatarPickerReplyPacket.DataBlock[] searchData =
+                new AvatarPickerReplyPacket.DataBlock[users.Count];
+            AvatarPickerReplyPacket.AgentDataBlock agentData = new AvatarPickerReplyPacket.AgentDataBlock();
+
+            agentData.AgentID = avatarID;
+            agentData.QueryID = RequestID;
+            replyPacket.AgentData = agentData;
+            //byte[] bytes = new byte[AvatarResponses.Count*32];
+
+            int i = 0;
+            foreach (UserData item in users)
+            {
+                UUID translatedIDtem = item.Id;
+                searchData[i] = new AvatarPickerReplyPacket.DataBlock();
+                searchData[i].AvatarID = translatedIDtem;
+                searchData[i].FirstName = Utils.StringToBytes((string)item.FirstName);
+                searchData[i].LastName = Utils.StringToBytes((string)item.LastName);
+                i++;
+            }
+            if (users.Count == 0)
+            {
+                searchData = new AvatarPickerReplyPacket.DataBlock[0];
+            }
+            replyPacket.Data = searchData;
+
+            AvatarPickerReplyAgentDataArgs agent_data = new AvatarPickerReplyAgentDataArgs();
+            agent_data.AgentID = replyPacket.AgentData.AgentID;
+            agent_data.QueryID = replyPacket.AgentData.QueryID;
+
+            List<AvatarPickerReplyDataArgs> data_args = new List<AvatarPickerReplyDataArgs>();
+            for (i = 0; i < replyPacket.Data.Length; i++)
+            {
+                AvatarPickerReplyDataArgs data_arg = new AvatarPickerReplyDataArgs();
+                data_arg.AvatarID = replyPacket.Data[i].AvatarID;
+                data_arg.FirstName = replyPacket.Data[i].FirstName;
+                data_arg.LastName = replyPacket.Data[i].LastName;
+                data_args.Add(data_arg);
+            }
+            client.SendAvatarPickerReply(agent_data, data_args);
+        }
+
+        protected virtual void AddAdditionalUsers(UUID avatarID, string query, List<UserData> users)
+        {
+        }
+
         #endregion Event Handlers
 
         private void CacheCreators(SceneObjectGroup sog)
@@ -425,13 +499,23 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         #endregion IUserManagement
 
+        protected void RegisterConsoleCmds()
+        {
+            MainConsole.Instance.Commands.AddCommand("Users", true,
+                "show names",
+                "show names",
+                "Show the bindings between user UUIDs and user names",
+                String.Empty,
+                HandleShowUsers);
+        }
+
         private void HandleShowUsers(string module, string[] cmd)
         {
             lock (m_UserCache)
             {
                 if (m_UserCache.Count == 0)
                 {
-                    MainConsole.Instance.Output("No users not found");
+                    MainConsole.Instance.Output("No users found");
                     return;
                 }
     
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index e22fd38..dc6efed 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -9,6 +9,7 @@
 
     <Extension path = "/OpenSim/RegionModules">
         <RegionModule id="UserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.UserManagementModule" />
+        <RegionModule id="HGUserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.HGUserManagementModule" />
         <RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />
         <RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />
         <RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" />
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
new file mode 100644
index 0000000..f0d21e6
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Nini.Config;
+using log4net;
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenMetaverse;
+
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
+{
+    public class AuthorizationService : IAuthorizationService
+    {
+        private enum AccessFlags
+        {
+            None = 0,               /* No restrictions */
+            DisallowResidents = 1,  /* Only gods and managers*/
+            DisallowForeigners = 2, /* Only local people */
+        }
+
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IUserManagement m_UserManagement;
+        private IGridService m_GridService;
+
+        private Scene m_Scene;
+        AccessFlags m_accessValue = AccessFlags.None;
+
+
+        public AuthorizationService(IConfig config, Scene scene)
+        {
+            m_Scene = scene;
+            m_UserManagement = scene.RequestModuleInterface<IUserManagement>();
+            m_GridService = scene.GridService;
+
+            if (config != null)
+            {
+                string accessStr = config.GetString("Region_" + scene.RegionInfo.RegionName.Replace(' ', '_'), String.Empty);
+                if (accessStr != string.Empty)
+                {
+                    try
+                    {
+                        m_accessValue = (AccessFlags)Enum.Parse(typeof(AccessFlags), accessStr);
+                    }
+                    catch (ArgumentException)
+                    {
+                        m_log.WarnFormat("[AuthorizationService]: {0} is not a valid access flag", accessStr);
+                    }
+                }
+                m_log.DebugFormat("[AuthorizationService]: Region {0} access restrictions: {1}", m_Scene.RegionInfo.RegionName, m_accessValue);
+            }
+
+        }
+
+        public bool IsAuthorizedForRegion(
+            string user, string firstName, string lastName, string regionID, out string message)
+        {
+            message = "authorized";
+
+            // This should not happen
+            if (m_Scene.RegionInfo.RegionID.ToString() != regionID)
+            {
+                m_log.WarnFormat("[AuthorizationService]: Service for region {0} received request to authorize for region {1}",
+                    m_Scene.RegionInfo.RegionID, regionID);
+                return true;
+            }
+
+            if (m_accessValue == AccessFlags.None)
+                return true;
+
+            UUID userID = new UUID(user);
+            bool authorized = true;
+            if ((m_accessValue & AccessFlags.DisallowForeigners) == AccessFlags.DisallowForeigners)
+            {
+                authorized = m_UserManagement.IsLocalGridUser(userID);
+                if (!authorized)
+                    message = "no foreigner users allowed in this region";
+            }
+            if (authorized && (m_accessValue & AccessFlags.DisallowResidents) == AccessFlags.DisallowResidents)
+            {
+                authorized = m_Scene.Permissions.IsGod(userID) | m_Scene.Permissions.IsAdministrator(userID);
+                if (!authorized)
+                    message = "only Admins and Managers allowed in this region";
+            }
+
+            return authorized;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
index 18a7177..c982db6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
@@ -39,13 +39,15 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
 {
-    public class LocalAuthorizationServicesConnector : ISharedRegionModule, IAuthorizationService
+    public class LocalAuthorizationServicesConnector : INonSharedRegionModule, IAuthorizationService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
         private IAuthorizationService m_AuthorizationService;
+        private Scene m_Scene;
+        private IConfig m_AuthorizationConfig;
 
         private bool m_Enabled = false;
 
@@ -69,33 +71,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                 string name = moduleConfig.GetString("AuthorizationServices", string.Empty);
                 if (name == Name)
                 {
-                    IConfig authorizationConfig = source.Configs["AuthorizationService"];
-                    if (authorizationConfig == null)
-                    {
-                        m_log.Error("[AUTHORIZATION CONNECTOR]: AuthorizationService missing from OpenSim.ini");
-                        return;
-                    }
-
-                    string serviceDll = authorizationConfig.GetString("LocalServiceModule",
-                            String.Empty);
-
-                    if (serviceDll == String.Empty)
-                    {
-                        m_log.Error("[AUTHORIZATION CONNECTOR]: No LocalServiceModule named in section AuthorizationService");
-                        return;
-                    }
-
-                    Object[] args = new Object[] { source };
-                    m_AuthorizationService =
-                            ServerUtils.LoadPlugin<IAuthorizationService>(serviceDll,
-                            args);
-
-                    if (m_AuthorizationService == null)
-                    {
-                        m_log.Error("[AUTHORIZATION CONNECTOR]: Can't load authorization service");
-                        return;
-                    }
                     m_Enabled = true;
+                    m_AuthorizationConfig = source.Configs["AuthorizationService"];
                     m_log.Info("[AUTHORIZATION CONNECTOR]: Local authorization connector enabled");
                 }
             }
@@ -115,6 +92,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                 return;
 
             scene.RegisterModuleInterface<IAuthorizationService>(this);
+            m_Scene = scene;
+
+            scene.EventManager.OnLoginsEnabled += new EventManager.LoginsEnabled(OnLoginsEnabled);
         }
 
         public void RemoveRegion(Scene scene)
@@ -131,9 +111,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
                 scene.RegionInfo.RegionName);
         }
 
+        private void OnLoginsEnabled(string regionName)
+        {
+            m_AuthorizationService = new AuthorizationService(m_AuthorizationConfig, m_Scene);
+        }
+
         public bool IsAuthorizedForRegion(
             string userID, string firstName, string lastName, string regionID, out string message)
         {
+            message = "";
+            if (!m_Enabled)
+                return true;
+
             return m_AuthorizationService.IsAuthorizedForRegion(userID, firstName, lastName, regionID, out message);
         }
     }
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 35f47d2..b95bda5 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -26,8 +26,10 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Security;
 using System.Timers;
@@ -46,8 +48,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private delegate void LookupUUIDS(List<UUID> uuidLst);
-
         private Timer m_regionChangeTimer = new Timer();
         public Scene Scene { get; private set; }
         public IUserManagement UserManager { get; private set; }
@@ -907,98 +907,77 @@ namespace OpenSim.Region.CoreModules.World.Estate
             if (!Scene.Permissions.CanIssueEstateCommand(remoteClient.AgentId, false))
                 return;
 
-            Dictionary<uint, float> SceneData = new Dictionary<uint,float>();
+            Dictionary<uint, float> sceneData = null;
             List<UUID> uuidNameLookupList = new List<UUID>();
 
             if (reportType == 1)
             {
-                SceneData = Scene.PhysicsScene.GetTopColliders();
+                sceneData = Scene.PhysicsScene.GetTopColliders();
             }
             else if (reportType == 0)
             {
-                SceneData = Scene.SceneGraph.GetTopScripts();
+                IScriptModule scriptModule = Scene.RequestModuleInterface<IScriptModule>();
+
+                if (scriptModule != null)
+                    sceneData = scriptModule.GetObjectScriptsExecutionTimes();
             }
 
             List<LandStatReportItem> SceneReport = new List<LandStatReportItem>();
-            lock (SceneData)
+            if (sceneData != null)
             {
-                foreach (uint obj in SceneData.Keys)
+                var sortedSceneData
+                    = sceneData.Select(
+                        item => new { Measurement = item.Value, Part = Scene.GetSceneObjectPart(item.Key) });
+
+                sortedSceneData.OrderBy(item => item.Measurement);
+
+                int items = 0;
+
+                foreach (var entry in sortedSceneData)
                 {
-                    SceneObjectPart prt = Scene.GetSceneObjectPart(obj);
-                    if (prt != null)
+                    // The object may have been deleted since we received the data.
+                    if (entry.Part == null)
+                        continue;
+
+                    // Don't show scripts that haven't executed or where execution time is below one microsecond in
+                    // order to produce a more readable report.
+                    if (entry.Measurement < 0.001)
+                        continue;
+
+                    items++;
+                    SceneObjectGroup so = entry.Part.ParentGroup;
+
+                    LandStatReportItem lsri = new LandStatReportItem();
+                    lsri.LocationX = so.AbsolutePosition.X;
+                    lsri.LocationY = so.AbsolutePosition.Y;
+                    lsri.LocationZ = so.AbsolutePosition.Z;
+                    lsri.Score = entry.Measurement;
+                    lsri.TaskID = so.UUID;
+                    lsri.TaskLocalID = so.LocalId;
+                    lsri.TaskName = entry.Part.Name;
+                    lsri.OwnerName = UserManager.GetUserName(so.OwnerID);
+
+                    if (filter.Length != 0)
                     {
-                        SceneObjectGroup sog = prt.ParentGroup;
-                        LandStatReportItem lsri = new LandStatReportItem();
-                        lsri.LocationX = sog.AbsolutePosition.X;
-                        lsri.LocationY = sog.AbsolutePosition.Y;
-                        lsri.LocationZ = sog.AbsolutePosition.Z;
-                        lsri.Score = SceneData[obj];
-                        lsri.TaskID = sog.UUID;
-                        lsri.TaskLocalID = sog.LocalId;
-                        lsri.TaskName = sog.GetPartName(obj);
-                        lsri.OwnerName = "waiting";
-                        lock (uuidNameLookupList)
-                            uuidNameLookupList.Add(sog.OwnerID);
-
-                        if (filter.Length != 0)
+                        if ((lsri.OwnerName.Contains(filter) || lsri.TaskName.Contains(filter)))
                         {
-                            if ((lsri.OwnerName.Contains(filter) || lsri.TaskName.Contains(filter)))
-                            {
-                            }
-                            else
-                            {
-                                continue;
-                            }
                         }
-
-                        SceneReport.Add(lsri);
+                        else
+                        {
+                            continue;
+                        }
                     }
+
+                    SceneReport.Add(lsri);
+
+                    if (items >= 100)
+                        break;
                 }
             }
 
             remoteClient.SendLandStatReply(reportType, requestFlags, (uint)SceneReport.Count,SceneReport.ToArray());
-
-            if (uuidNameLookupList.Count > 0)
-                LookupUUID(uuidNameLookupList);
         }
 
-        private static void LookupUUIDSCompleted(IAsyncResult iar)
-        {
-            LookupUUIDS icon = (LookupUUIDS)iar.AsyncState;
-            icon.EndInvoke(iar);
-        }
-        
-        private void LookupUUID(List<UUID> uuidLst)
-        {
-            LookupUUIDS d = LookupUUIDsAsync;
-
-            d.BeginInvoke(uuidLst,
-                          LookupUUIDSCompleted,
-                          d);
-        }
-        
-        private void LookupUUIDsAsync(List<UUID> uuidLst)
-        {
-            UUID[] uuidarr;
-
-            lock (uuidLst)
-            {
-                uuidarr = uuidLst.ToArray();
-            }
-
-            for (int i = 0; i < uuidarr.Length; i++)
-            {
-                // string lookupname = Scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
-
-                IUserManagement userManager = Scene.RequestModuleInterface<IUserManagement>();
-                if (userManager != null)
-                    userManager.GetUserName(uuidarr[i]);
-                
-                // we drop it.  It gets cached though...  so we're ready for the next request.
-                // diva commnent 11/21/2010: uh?!? wft?
-                // justincc comment 21/01/2011: A side effect of userManager.GetUserName() I presume.
-            }
-        }
         #endregion
 
         #region Outgoing Packets
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 0f83d82..02ac091 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1664,7 +1664,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     {
                         if (e.OwnerID == targetID)
                         {
-                            if (e.scriptScore >= 0.01)
+                            if (e.ContainsScripts())
                             {
                                 returns.Add(e);
                             }
@@ -1681,7 +1681,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             ILandObject landobject = ((Scene)client.Scene).LandChannel.GetLandObject(e.AbsolutePosition.X, e.AbsolutePosition.Y);
                             if (landobject.LandData.OwnerID != e.OwnerID)
                             {
-                                if (e.scriptScore >= 0.01)
+                                if (e.ContainsScripts())
                                 {
                                     returns.Add(e);
                                 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 4805ccb..c51e140 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -86,6 +86,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private volatile bool m_tainted;
         private readonly Stack<LandUndoState> m_undo = new Stack<LandUndoState>(5);
 
+        private String m_InitialTerrain = "pinhead-island";
+
         /// <summary>
         /// Human readable list of terrain file extensions that are supported.
         /// </summary>
@@ -109,6 +111,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         /// <param name="config">Config for the region</param>
         public void Initialise(IConfigSource config)
         {
+            IConfig terrainConfig = config.Configs["Terrain"];
+            if (terrainConfig != null)
+                m_InitialTerrain = terrainConfig.GetString("InitialTerrain", m_InitialTerrain);
         }
 
         public void AddRegion(Scene scene)
@@ -120,7 +125,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             {
                 if (m_scene.Heightmap == null)
                 {
-                    m_channel = new TerrainChannel();
+                    m_channel = new TerrainChannel(m_InitialTerrain);
                     m_scene.Heightmap = m_channel;
                     m_revert = new TerrainChannel();
                     UpdateRevertMap();
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index f9384e9..3efb7dd 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -92,7 +92,23 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 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...
+            //
+            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);
@@ -114,7 +130,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         data.MapImageId = UUID.Zero; 
                     else
                         data.MapImageId = info.TerrainImage;
-                    data.Name = info.RegionName;
+                    // ugh! V2-3 is very sensitive about the result being
+                    // exactly the same as the requested name
+                    if (regionInfos.Count == 1)
+                        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);
@@ -138,6 +159,17 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             // 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) 
+            {
+                if (regionInfos.Count == 0)
+                    remoteClient.SendAgentAlertMessage("No regions found with that name.", true);
+                else if (regionInfos.Count == 1)
+                    remoteClient.SendAgentAlertMessage("Region found!", false);
+            }
         }
 
 //        private Scene GetClientScene(IClientAPI client)