Merge branch 'master' into careminster-presence-refactor

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs

OpenSim/Framework/Console/LocalConsole.cs

@@ -44,6 +44,7 @@ namespace OpenSim.Framework.Console
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         // private readonly object m_syncRoot = new object();
+        private const string LOGLEVEL_NONE = "(none)";
 
         private int y = -1;
         private int cp = 0;
@@ -278,22 +279,25 @@ namespace OpenSim.Framework.Console
 
         private void WriteLocalText(string text, string level)
         {
-            string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)";
-
-            Regex RE = new Regex(regex, RegexOptions.Multiline);
-            MatchCollection matches = RE.Matches(text);
-
             string outText = text;
 
-            if (matches.Count == 1)
+            if (level != LOGLEVEL_NONE)
             {
-                outText = matches[0].Groups["End"].Value;
+                string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)";
-                System.Console.Write(matches[0].Groups["Front"].Value);
 
-                System.Console.Write("[");
+                Regex RE = new Regex(regex, RegexOptions.Multiline);
-                WriteColorText(DeriveColor(matches[0].Groups["Category"].Value),
+                MatchCollection matches = RE.Matches(text);
-                        matches[0].Groups["Category"].Value);
+
-                System.Console.Write("]:");
+                if (matches.Count == 1)
+                {
+                    outText = matches[0].Groups["End"].Value;
+                    System.Console.Write(matches[0].Groups["Front"].Value);
+
+                    System.Console.Write("[");
+                    WriteColorText(DeriveColor(matches[0].Groups["Category"].Value),
+                            matches[0].Groups["Category"].Value);
+                    System.Console.Write("]:");
+                }
             }
 
             if (level == "error")
@@ -308,7 +312,7 @@ namespace OpenSim.Framework.Console
 
         public override void Output(string text)
         {
-            Output(text, "normal");
+            Output(text, LOGLEVEL_NONE);
         }
 
         public override void Output(string text, string level)

OpenSim/Framework/Tests/MundaneFrameworkTests.cs

@@ -140,10 +140,10 @@ namespace OpenSim.Framework.Tests
             settings.Save();
             settings.OnSave -= RegionSaveFired;
 
-            string str = settings.LoadedCreationDate;
+//            string str = settings.LoadedCreationDate;
-            int dt = settings.LoadedCreationDateTime;
+//            int dt = settings.LoadedCreationDateTime;
-            string id = settings.LoadedCreationID;
+//            string id = settings.LoadedCreationID;
-            string time = settings.LoadedCreationTime;
+//            string time = settings.LoadedCreationTime;
 
             Assert.That(m_RegionSettingsOnSaveEventFired, "RegionSettings Save Event didn't Fire");
             

OpenSim/Region/Framework/Scenes/SceneViewer.cs

@@ -179,11 +179,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void Reset()
         {
-            if (m_pendingObjects != null)
+            if (m_pendingObjects == null)
-            {
+                return;
-                lock (m_pendingObjects)
-                {
 
+            lock (m_pendingObjects)
+            {
+                if (m_pendingObjects != null)
+                {
                     m_pendingObjects.Clear();
                     m_pendingObjects = null;
                 }

OpenSim/Region/Physics/Meshing/Meshmerizer.cs

@@ -81,7 +81,8 @@ namespace OpenSim.Region.Physics.Meshing
         {
             IConfig start_config = config.Configs["Startup"];
 
-            decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
+            decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
+            cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
 
             try
             {

bin/OpenSim.ini.example

@@ -13,7 +13,10 @@
 ;;    An empty question will set the default if the dependencies are
 ;;    satisfied.
 ;;
-;; ; denotes a commented option. It is ignored.
+;; ;  denotes a commented out option. Uncomment it to actvate it
+;;    and change it to the desired value
+;;    Any options added to OpenSim.ini.exmaple must be commented out,
+;;    and their value must represent the default.
 
 [Startup]
     ;# {save_crashes} {} {Save crashes to disk?} {true false} false

bin/OpenSimDefaults.ini

@@ -139,7 +139,15 @@
     ;; Path to decoded sculpty maps
     ;; Defaults to "j2kDecodeCache
     ;DecodedSculptMapPath = "j2kDecodeCache"
-
+    
+    ;# {CacheSculptMaps} {Cache decoded sculpt maps?} {true false} true
+    ;; if you use Meshmerizer and want sculpt map collisions, setting this to
+    ;; to true will store decoded sculpt maps in a special folder in your bin
+    ;; folder, which can reduce startup times by reducing asset requests. Some
+    ;; versions of mono dont work well when reading the cache files, so set this
+    ;; to false if you have compatability problems.
+    ; CacheSculptMaps = true
+    
     ; Choose one of the physics engines below
     ; OpenDynamicsEngine is by some distance the most developed physics engine
     ; basicphysics effectively does not model physics at all, making all objects phantom