Merge branch 'master' into bulletsim

3 files changed, 163 insertions, 64 deletions

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 851b7b4..c7a259d 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -84,11 +84,20 @@ namespace OpenSim.Services.AssetService
                     if (assetLoaderEnabled)
                     {
                         m_log.InfoFormat("[ASSET]: Loading default asset set from {0}", loaderArgs);
-                        m_AssetLoader.ForEachDefaultXmlAsset(loaderArgs,
-                                delegate(AssetBase a)
+
+                        m_AssetLoader.ForEachDefaultXmlAsset(
+                            loaderArgs,
+                            delegate(AssetBase a)
+                            {
+                                AssetBase existingAsset = Get(a.ID);
+//                                AssetMetadata existingMetadata = GetMetadata(a.ID);
+
+                                if (existingAsset == null || Util.SHA1Hash(existingAsset.Data) != Util.SHA1Hash(a.Data))
                                 {
+//                                    m_log.DebugFormat("[ASSET]: Storing {0} {1}", a.Name, a.ID);
                                     Store(a);
-                                });
+                                }
+                            });
                     }
 
                     m_log.Info("[ASSET SERVICE]: Local asset service enabled");
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 5262598..83ec122 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Services.GridService
         protected GatekeeperServiceConnector m_GatekeeperConnector;
 
         protected UUID m_ScopeID = UUID.Zero;
-        protected bool m_Check4096 = true;
+//        protected bool m_Check4096 = true;
         protected string m_MapTileDirectory = string.Empty;
         protected string m_ThisGatekeeper = string.Empty;
         protected Uri m_ThisGatekeeperURI = null;
@@ -121,7 +121,7 @@ namespace OpenSim.Services.GridService
                 if (scope != string.Empty)
                     UUID.TryParse(scope, out m_ScopeID);
 
-                m_Check4096 = gridConfig.GetBoolean("Check4096", true);
+//                m_Check4096 = gridConfig.GetBoolean("Check4096", true);
 
                 m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
 
@@ -347,14 +347,18 @@ namespace OpenSim.Services.GridService
                 return true;
             }
 
-            uint x, y;
-            if (m_Check4096 && !Check4096(handle, out x, out y))
-            {
-                RemoveHyperlinkRegion(regInfo.RegionID);
-                reason = "Region is too far (" + x + ", " + y + ")";
-                m_log.Info("[HYPERGRID LINKER]: Unable to link, region is too far (" + x + ", " + y + ")");
-                return false;
-            }
+            // We are now performing this check for each individual teleport in the EntityTransferModule instead.  This
+            // allows us to give better feedback when teleports fail because of the distance reason (which can't be
+            // done here) and it also hypergrid teleports that are within range (possibly because the source grid
+            // itself has regions that are very far apart).
+//            uint x, y;
+//            if (m_Check4096 && !Check4096(handle, out x, out y))
+//            {
+//                //RemoveHyperlinkRegion(regInfo.RegionID);
+//                reason = "Region is too far (" + x + ", " + y + ")";
+//                m_log.Info("[HYPERGRID LINKER]: Unable to link, region is too far (" + x + ", " + y + ")");
+//                //return false;
+//            }
 
             regInfo.RegionID = regionID;
 
@@ -405,60 +409,59 @@ namespace OpenSim.Services.GridService
             }
         }
 
-        /// <summary>
-        /// Cope with this viewer limitation.
-        /// </summary>
-        /// <param name="regInfo"></param>
-        /// <returns></returns>
-        public bool Check4096(ulong realHandle, out uint x, out uint y)
-        {
-            uint ux = 0, uy = 0;
-            Utils.LongToUInts(realHandle, out ux, out uy);
-            x = ux / Constants.RegionSize;
-            y = uy / Constants.RegionSize;
-
-            const uint limit = (4096 - 1) * Constants.RegionSize;
-            uint xmin = ux - limit;
-            uint xmax = ux + limit;
-            uint ymin = uy - limit;
-            uint ymax = uy + limit;
-            // World map boundary checks
-            if (xmin < 0 || xmin > ux)
-                xmin = 0;
-            if (xmax > int.MaxValue || xmax < ux)
-                xmax = int.MaxValue;
-            if (ymin < 0 || ymin > uy)
-                ymin = 0;
-            if (ymax > int.MaxValue || ymax < uy)
-                ymax = int.MaxValue;
-
-            // Check for any regions that are within the possible teleport range to the linked region
-            List<GridRegion> regions = m_GridService.GetRegionRange(m_ScopeID, (int)xmin, (int)xmax, (int)ymin, (int)ymax);
-            if (regions.Count == 0)
-            {
-                return false;
-            }
-            else
-            {
-                // Check for regions which are not linked regions
-                List<GridRegion> hyperlinks = m_GridService.GetHyperlinks(m_ScopeID);
-                IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
-                if (availableRegions.Count() == 0)
-                    return false;
-            }
-
-            return true;
-        }
+// Not currently used
+//        /// <summary>
+//        /// Cope with this viewer limitation.
+//        /// </summary>
+//        /// <param name="regInfo"></param>
+//        /// <returns></returns>
+//        public bool Check4096(ulong realHandle, out uint x, out uint y)
+//        {
+//            uint ux = 0, uy = 0;
+//            Utils.LongToUInts(realHandle, out ux, out uy);
+//            x = ux / Constants.RegionSize;
+//            y = uy / Constants.RegionSize;
+//
+//            const uint limit = (4096 - 1) * Constants.RegionSize;
+//            uint xmin = ux - limit;
+//            uint xmax = ux + limit;
+//            uint ymin = uy - limit;
+//            uint ymax = uy + limit;
+//            // World map boundary checks
+//            if (xmin < 0 || xmin > ux)
+//                xmin = 0;
+//            if (xmax > int.MaxValue || xmax < ux)
+//                xmax = int.MaxValue;
+//            if (ymin < 0 || ymin > uy)
+//                ymin = 0;
+//            if (ymax > int.MaxValue || ymax < uy)
+//                ymax = int.MaxValue;
+//
+//            // Check for any regions that are within the possible teleport range to the linked region
+//            List<GridRegion> regions = m_GridService.GetRegionRange(m_ScopeID, (int)xmin, (int)xmax, (int)ymin, (int)ymax);
+//            if (regions.Count == 0)
+//            {
+//                return false;
+//            }
+//            else
+//            {
+//                // Check for regions which are not linked regions
+//                List<GridRegion> hyperlinks = m_GridService.GetHyperlinks(m_ScopeID);
+//                IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
+//                if (availableRegions.Count() == 0)
+//                    return false;
+//            }
+//
+//            return true;
+//        }
 
         private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle)
         {
-
             RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo);
             int flags = (int)OpenSim.Data.RegionFlags.Hyperlink + (int)OpenSim.Data.RegionFlags.NoDirectLogin + (int)OpenSim.Data.RegionFlags.RegionOnline;
             rdata.Data["flags"] = flags.ToString();
 
             m_Database.Store(rdata);
-
         }
 
         private void RemoveHyperlinkRegion(UUID regionID)
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index f376cf8..8b8a8f9 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -83,9 +83,24 @@ namespace OpenSim.Services.UserAccountService
                             "create user",
                             "create user [<first> [<last> [<pass> [<email>]]]]",
                             "Create a new user", HandleCreateUser);
-                    MainConsole.Instance.Commands.AddCommand("UserService", false, "reset user password",
+
+                    MainConsole.Instance.Commands.AddCommand("UserService", false,
+                            "reset user password",
                             "reset user password [<first> [<last> [<password>]]]",
                             "Reset a user password", HandleResetUserPassword);
+
+                    MainConsole.Instance.Commands.AddCommand("UserService", false,
+                            "set user level",
+                            "set user level [<first> [<last> [<level>]]]",
+                            "Set user level. If >= 200 and 'allow_grid_gods = true' in OpenSim.ini, "
+                                + "this account will be treated as god-moded. "
+                                + "It will also affect the 'login level' command. ",
+                            HandleSetUserLevel);
+
+                    MainConsole.Instance.Commands.AddCommand("UserService", false,
+                            "show account",
+                            "show account <first> <last>",
+                            "Show account details for the given user", HandleShowAccount);
                 }
 
             }
@@ -318,6 +333,36 @@ namespace OpenSim.Services.UserAccountService
             CreateUser(firstName, lastName, password, email);
         }
 
+        protected void HandleShowAccount(string module, string[] cmdparams)
+        {
+            if (cmdparams.Length != 4)
+            {
+                MainConsole.Instance.Output("Usage: show account <first-name> <last-name>");
+                return;
+            }
+
+            string firstName = cmdparams[2];
+            string lastName = cmdparams[3];
+
+            UserAccount ua = GetUserAccount(UUID.Zero, firstName, lastName);
+
+            if (ua == null)
+            {
+                MainConsole.Instance.OutputFormat("No user named {0} {1}", firstName, lastName);
+                return;
+            }
+
+            MainConsole.Instance.OutputFormat("Name:    {0}", ua.Name);
+            MainConsole.Instance.OutputFormat("ID:      {0}", ua.PrincipalID);
+            MainConsole.Instance.OutputFormat("Title:   {0}", ua.UserTitle);
+            MainConsole.Instance.OutputFormat("E-mail:  {0}", ua.Email);
+            MainConsole.Instance.OutputFormat("Created: {0}", Utils.UnixTimeToDateTime(ua.Created));
+            MainConsole.Instance.OutputFormat("Level:   {0}", ua.UserLevel);
+            MainConsole.Instance.OutputFormat("Flags:   {0}", ua.UserFlags);
+            foreach (KeyValuePair<string, Object> kvp in ua.ServiceURLs)
+                MainConsole.Instance.OutputFormat("{0}: {1}", kvp.Key, kvp.Value);
+        }
+
         protected void HandleResetUserPassword(string module, string[] cmdparams)
         {
             string firstName;
@@ -338,16 +383,58 @@ namespace OpenSim.Services.UserAccountService
 
             UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
             if (account == null)
-                m_log.ErrorFormat("[USER ACCOUNT SERVICE]: No such user");
+            {
+                MainConsole.Instance.OutputFormat("No such user as {0} {1}", firstName, lastName);
+                return;
+            }
 
             bool success = false;
             if (m_AuthenticationService != null)
                 success = m_AuthenticationService.SetPassword(account.PrincipalID, newPassword);
+
+            if (!success)
+                MainConsole.Instance.OutputFormat("Unable to reset password for account {0} {1}.", firstName, lastName);
+            else
+                MainConsole.Instance.OutputFormat("Password reset for user {0} {1}", firstName, lastName);
+        }
+
+        protected void HandleSetUserLevel(string module, string[] cmdparams)
+        {
+            string firstName;
+            string lastName;
+            string rawLevel;
+            int level;
+
+            if (cmdparams.Length < 4)
+                firstName = MainConsole.Instance.CmdPrompt("First name");
+            else firstName = cmdparams[3];
+
+            if (cmdparams.Length < 5)
+                lastName = MainConsole.Instance.CmdPrompt("Last name");
+            else lastName = cmdparams[4];
+
+            UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
+            if (account == null) {
+                MainConsole.Instance.OutputFormat("No such user");
+                return;
+            }
+
+            if (cmdparams.Length < 6)
+                rawLevel = MainConsole.Instance.CmdPrompt("User level");
+            else rawLevel = cmdparams[5];
+
+            if(int.TryParse(rawLevel, out level) == false) {
+                MainConsole.Instance.OutputFormat("Invalid user level");
+                return;
+            }
+
+            account.UserLevel = level;
+
+            bool success = StoreUserAccount(account);
             if (!success)
-                m_log.ErrorFormat("[USER ACCOUNT SERVICE]: Unable to reset password for account {0} {1}.",
-                   firstName, lastName);
+                MainConsole.Instance.OutputFormat("Unable to set user level for account {0} {1}.", firstName, lastName);
             else
-                m_log.InfoFormat("[USER ACCOUNT SERVICE]: Password reset for user {0} {1}", firstName, lastName);
+                MainConsole.Instance.OutputFormat("User level set for user {0} {1} to {2}", firstName, lastName, level);
         }
 
         #endregion