Merge branch 'master' into careminster-presence-refactor

5 files changed, 33 insertions, 33 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 60e8c1a..e7ebab3 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -781,6 +781,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             LookupUUIDS icon = (LookupUUIDS)iar.AsyncState;
             icon.EndInvoke(iar);
         }
+        
         private void LookupUUID(List<UUID> uuidLst)
         {
             LookupUUIDS d = LookupUUIDsAsync;
@@ -789,6 +790,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                           LookupUUIDSCompleted,
                           d);
         }
+        
         private void LookupUUIDsAsync(List<UUID> uuidLst)
         {
             UUID[] uuidarr;
@@ -803,12 +805,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
 
                 IUserManagement userManager = m_scene.RequestModuleInterface<IUserManagement>();
-                string userName = "Unkown User";
                 if (userManager != null)
-                    userName = userManager.GetUserName(uuidarr[i]);
+                    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
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index f4ebbf0..a00b6b2 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -217,6 +217,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                         ParcelFlags.AllowDamage |
                         ParcelFlags.CreateObjects |
                         ParcelFlags.RestrictPushObject |
+                        ParcelFlags.AllowOtherScripts |
                         ParcelFlags.AllowGroupScripts |
                         ParcelFlags.CreateGroupObjects |
                         ParcelFlags.AllowAPrimitiveEntry |
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index ec97acd..0e861a1 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
         private static readonly ILog m_log = 
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private Commander m_commander = new Commander("export");
+//        private Commander m_commander = new Commander("export");
         private List<Scene> m_regions = new List<Scene>();
         private string m_savedir = "exports";
         private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>();
@@ -77,14 +77,13 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
                 m_serialisers.Add(new SerialiseObjects());
             }
 
-            LoadCommanderCommands();
+//            LoadCommanderCommands();
         }
 
-
         public void AddRegion(Scene scene)
         {
-            scene.RegisterModuleCommander(m_commander);
-            scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
+//            scene.RegisterModuleCommander(m_commander);
+//            scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
             scene.RegisterModuleInterface<IRegionSerialiserModule>(this);
 
             lock (m_regions)
@@ -211,18 +210,18 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
 
         #endregion
 
-        private void EventManager_OnPluginConsole(string[] args)
-        {
-            if (args[0] == "export")
-            {
-                string[] tmpArgs = new string[args.Length - 2];
-                int i = 0;
-                for (i = 2; i < args.Length; i++)
-                    tmpArgs[i - 2] = args[i];
-
-                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
-            }
-        }
+//        private void EventManager_OnPluginConsole(string[] args)
+//        {
+//            if (args[0] == "export")
+//            {
+//                string[] tmpArgs = new string[args.Length - 2];
+//                int i = 0;
+//                for (i = 2; i < args.Length; i++)
+//                    tmpArgs[i - 2] = args[i];
+//
+//                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
+//            }
+//        }
 
         private void InterfaceSaveRegion(Object[] args)
         {
@@ -245,15 +244,15 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
             }
         }
 
-        private void LoadCommanderCommands()
-        {
-            Command serialiseSceneCommand = new Command("save", CommandIntentions.COMMAND_NON_HAZARDOUS, InterfaceSaveRegion, "Saves the named region into the exports directory.");
-            serialiseSceneCommand.AddArgument("region-name", "The name of the region you wish to export", "String");
-
-            Command serialiseAllScenesCommand = new Command("save-all",CommandIntentions.COMMAND_NON_HAZARDOUS,  InterfaceSaveAllRegions, "Saves all regions into the exports directory.");
-
-            m_commander.RegisterCommand("save", serialiseSceneCommand);
-            m_commander.RegisterCommand("save-all", serialiseAllScenesCommand);
-        }
+//        private void LoadCommanderCommands()
+//        {
+//            Command serialiseSceneCommand = new Command("save", CommandIntentions.COMMAND_NON_HAZARDOUS, InterfaceSaveRegion, "Saves the named region into the exports directory.");
+//            serialiseSceneCommand.AddArgument("region-name", "The name of the region you wish to export", "String");
+//
+//            Command serialiseAllScenesCommand = new Command("save-all",CommandIntentions.COMMAND_NON_HAZARDOUS,  InterfaceSaveAllRegions, "Saves all regions into the exports directory.");
+//
+//            m_commander.RegisterCommand("save", serialiseSceneCommand);
+//            m_commander.RegisterCommand("save-all", serialiseAllScenesCommand);
+//        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 8df44fe..09c0ebb 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
 {
     public class SoundModule : IRegionModule, ISoundModule
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         protected Scene m_scene;
         
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs
index af59d7a..522a7eb 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs
@@ -85,9 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         public static float noise1(float arg)
         {
             int bx0, bx1;
-            float rx0, rx1, sx, t, u, v, a;
-
-            a = arg;
+            float rx0, rx1, sx, t, u, v;
 
             t = arg + N;
             bx0 = ((int)t) & BM;