14 files changed, 40 insertions, 47 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 03d023c..5a48134 100755
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -1075,14 +1075,14 @@ namespace OpenSim.Region.CoreModules.Asset
                 {
                     case "status":
                         if (m_MemoryCacheEnabled)
-                            con.Output("Memory Cache: {0} assets", null, m_MemoryCache.Count);
+                            con.Output("Memory Cache: {0} assets", m_MemoryCache.Count);
                         else
                             con.Output("Memory cache disabled");
 
                         if (m_FileCacheEnabled)
                         {
                             int fileCount = GetFileCacheCount(m_CacheDirectory);
-                            con.Output("File Cache: {0} assets", null, fileCount);
+                            con.Output("File Cache: {0} assets", fileCount);
                         }
                         else
                         {
@@ -1099,7 +1099,7 @@ namespace OpenSim.Region.CoreModules.Asset
                             {
                                 string RegionID = s.Remove(0,s.IndexOf("_")).Replace(".fac","");
                                 DateTime RegionDeepScanTMStamp = File.GetLastWriteTime(s);
-                                con.Output("Region: {0}, {1}", null, RegionID, RegionDeepScanTMStamp.ToString("MM/dd/yyyy hh:mm:ss"));
+                                con.Output("Region: {0}, {1}", RegionID, RegionDeepScanTMStamp.ToString("MM/dd/yyyy hh:mm:ss"));
                             }
                         }
 
@@ -1192,7 +1192,7 @@ namespace OpenSim.Region.CoreModules.Asset
                                 }
                                 m_cleanupRunning = false;
                             }
-                            con.Output("Completed check with {0} assets.", null, assetReferenceTotal);
+                            con.Output("Completed check with {0} assets.", assetReferenceTotal);
                         }, null, "TouchAllSceneAssets", false);
 
                         break;
@@ -1218,7 +1218,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
                         if (!DateTime.TryParse(s_expirationDate, out expirationDate))
                         {
-                            con.Output("{0} is not a valid date & time", null, cmd);
+                            con.Output("{0} is not a valid date & time", cmd);
                             break;
                         }
 
@@ -1229,7 +1229,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
                         break;
                     default:
-                        con.Output("Unknown command {0}", null, cmd);
+                        con.Output("Unknown command {0}", cmd);
                         break;
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index a43db33..e342897 100755
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -165,14 +165,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             {
                 DebugLevel = debugLevel;
                 MainConsole.Instance.Output(
-                    "Set attachments debug level to {0} in {1}", null, DebugLevel, m_scene.Name);
+                    "Set attachments debug level to {0} in {1}", DebugLevel, m_scene.Name);
             }
         }
 
         private void HandleDebugAttachmentsStatus(string module, string[] args)
         {
-            MainConsole.Instance.Output("Settings for {0}", null, m_scene.Name);
-            MainConsole.Instance.Output("Debug logging level: {0}", null, DebugLevel);
+            MainConsole.Instance.Output("Settings for {0}", m_scene.Name);
+            MainConsole.Instance.Output("Debug logging level: {0}", DebugLevel);
         }
 
         protected void HandleShowAttachmentsCommand(string module, string[] cmd)
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 92616be..b985630 100755
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -295,7 +295,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             {
                 Primitive.TextureEntryFace bakedTextureFace = bakedTextures[bakeType];
 
-                if (bakedTextureFace == null)
+                if (bakedTextureFace == null || bakedTextureFace.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
                     continue;
 
                 AssetBase asset;
diff --git a/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs b/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
index d98f11a..c98e891 100755
--- a/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Avatars.Commands
 
             if (user == null)
             {
-                MainConsole.Instance.Output("No user found with name {0} {1}", null, firstName, lastName);
+                MainConsole.Instance.Output("No user found with name {0} {1}", firstName, lastName);
                 return;
             }
 
@@ -161,7 +161,7 @@ namespace OpenSim.Region.CoreModules.Avatars.Commands
 
                 if (!m.Success)
                 {
-                    MainConsole.Instance.Output("Invalid destination {0}", null, rawDestination);
+                    MainConsole.Instance.Output("Invalid destination {0}", rawDestination);
                     return;
                 }
             }
@@ -171,7 +171,6 @@ namespace OpenSim.Region.CoreModules.Avatars.Commands
 
             MainConsole.Instance.Output(
                 "Teleporting {0} to {1},{2},{3} in {4}",
-                null,
                 user.Name,
                 m.Groups["x"], m.Groups["y"], m.Groups["z"],
                 regionName);
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index da103b5..72d267d 100755
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -318,7 +318,6 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
             {
                 MainConsole.Instance.Output(
                     "[MONITOR MODULE]: {0} reports {1} = {2}",
-                    null,
                     m_scene.RegionInfo.RegionName, monitor.GetFriendlyName(), monitor.GetFriendlyValue());
             }
 
@@ -326,7 +325,6 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
             {
                 MainConsole.Instance.Output(
                     "[MONITOR MODULE]: {0} reports {1} = {2}",
-                    null,
                     m_scene.RegionInfo.RegionName, tuple.Key, tuple.Value);
             }
         }
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index cc2e611..c8ea271 100755
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -1040,7 +1040,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             if(!GetUser(userId, out ud))
             {
-                MainConsole.Instance.Output("No name known for user with id {0}", null, userId);
+                MainConsole.Instance.Output("No name known for user with id {0}", userId);
                 return;
             }
 
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 6985549..c1056d5 100755
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -2536,11 +2536,11 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (response.ToLower() == "y")
             {
                 Clear(true);
-                MainConsole.Instance.Output("Cleared all parcels from {0}", null, m_scene.Name);
+                MainConsole.Instance.Output("Cleared all parcels from {0}", m_scene.Name);
             }
             else
             {
-                MainConsole.Instance.Output("Aborting clear of all parcels from {0}", null, m_scene.Name);
+                MainConsole.Instance.Output("Aborting clear of all parcels from {0}", m_scene.Name);
             }
         }
 
@@ -2568,7 +2568,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     if (!m_landList.TryGetValue(landLocalId, out lo))
                     {
-                        MainConsole.Instance.Output("No parcel found with local ID {0}", null, landLocalId);
+                        MainConsole.Instance.Output("No parcel found with local ID {0}", landLocalId);
                         return;
                     }
                 }
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 66a7df1..ccf45c1 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -287,7 +287,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         protected void SetPartMediaFlags(SceneObjectPart part, int face, bool flag)
         {
             Primitive.TextureEntry te = part.Shape.Textures;
-            Primitive.TextureEntryFace teFace = te.CreateFace((uint)face);
+            Primitive.TextureEntryFace teFace = te.GetFace((uint)face);
             teFace.MediaFlags = flag;
             part.Shape.Textures = te;
         }
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index e118b66..18a16c2 100755
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -451,7 +451,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
             {
-                m_console.Output("Error: Start vector '{0}' does not have a valid format", null, rawConsoleStartVector);
+                m_console.Output("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector);
                 return;
             }
 
@@ -460,7 +460,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
             {
-                m_console.Output("Error: End vector '{0}' does not have a valid format", null, rawConsoleEndVector);
+                m_console.Output("Error: End vector '{0}' does not have a valid format", rawConsoleEndVector);
                 return;
             }
 
@@ -809,7 +809,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         if(so.IsAttachment)
                         {
                             requireConfirmation = true;
-                            m_console.Output("Warning: object with uuid {0} is a attachment", null, uuid);
+                            m_console.Output("Warning: object with uuid {0} is a attachment", uuid);
                         }
                     }
                     break;
@@ -853,7 +853,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                     break;
 
                 default:
-                    m_console.Output("Unrecognized mode {0}", null, mode);
+                    m_console.Output("Unrecognized mode {0}", mode);
                     return;
             }
 
@@ -871,17 +871,17 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 if (response.ToLower() != "y")
                 {
                     MainConsole.Instance.Output(
-                        "Aborting delete of {0} objects from {1}", null, deletes.Count, m_scene.RegionInfo.RegionName);
+                        "Aborting delete of {0} objects from {1}", deletes.Count, m_scene.RegionInfo.RegionName);
 
                     return;
                 }
             }
 
-            m_console.Output("Deleting {0} objects in {1}", null, deletes.Count, m_scene.RegionInfo.RegionName);
+            m_console.Output("Deleting {0} objects in {1}", deletes.Count, m_scene.RegionInfo.RegionName);
 
             foreach (SceneObjectGroup g in deletes)
             {
-                m_console.Output("Deleting object {0} {1}", null, g.UUID, g.Name);
+                m_console.Output("Deleting object {0} {1}", g.UUID, g.Name);
                 m_scene.DeleteSceneObject(g, false);
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
index 2a661a6..8d92cc8 100755
--- a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
@@ -226,7 +226,6 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 {
                     MainConsole.Instance.Output(
                         "Cannot set {0} to {1} in {2} as max-agent-limit is {3}", "agent-limit",
-                        null,
                         newValue, m_scene.Name, ri.AgentCapacity);
                 }
                 else
@@ -234,7 +233,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                     rs.AgentLimit = newValue;
 
                     MainConsole.Instance.Output(
-                        "{0} set to {1} in {2}", "agent-limit", null, newValue, m_scene.Name);
+                        "{0} set to {1} in {2}", "agent-limit", newValue, m_scene.Name);
                 }
 
                 rs.Save();
@@ -249,14 +248,14 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 ri.AgentCapacity = newValue;
 
                 MainConsole.Instance.Output(
-                    "{0} set to {1} in {2}", "max-agent-limit", null, newValue, m_scene.Name);
+                    "max-agent-limit set to {0} in {1}", newValue, m_scene.Name);
 
                 if (ri.AgentCapacity < rs.AgentLimit)
                 {
                     rs.AgentLimit = ri.AgentCapacity;
 
                     MainConsole.Instance.Output(
-                        "Reducing {0} to {1} in {2}", null, "agent-limit", rs.AgentLimit, m_scene.Name);
+                        "agent-limit set to {0} in {1}", rs.AgentLimit, m_scene.Name);
                 }
 
                 rs.Save();
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index 6d3daf2..d0fae25 100755
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -338,7 +338,7 @@ namespace OpenSim.Region.CoreModules.World.Region
                 times.Add(Convert.ToInt32(args[i]));
 
             MainConsole.Instance.Output(
-                "Region {0} scheduled for restart in {1} seconds", null, m_Scene.Name, times.Sum());
+                "Region {0} scheduled for restart in {1} seconds", m_Scene.Name, times.Sum());
 
             ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice);
         }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index d8c118f..02f0d3d 100755
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -793,7 +793,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             {
                 MainConsole.Instance.Output(
                     "ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}).  File width {2} from {3} and file height {4} from {5} does not.",
-                    null,
                     m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, fileWidth, fileStartX, fileHeight, fileStartY);
 
                 return;
@@ -813,7 +812,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
                         MainConsole.Instance.Output(
                             "Saved terrain from ({0},{1}) to ({2},{3}) from {4} to {5}",
-                            null,
                             fileStartX, fileStartY, fileStartX + fileWidth - 1, fileStartY + fileHeight - 1,
                             m_scene.RegionInfo.RegionName, filename);
                     }
@@ -824,7 +822,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             MainConsole.Instance.Output(
                 "ERROR: Could not save terrain from {0} to {1}.  Valid file extensions are {2}",
-                null,
                 m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave);
         }
 
@@ -1706,8 +1703,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             double avg = sum / (m_channel.Height * m_channel.Width);
 
-            MainConsole.Instance.Output("Channel {0}x{1}", null, m_channel.Width, m_channel.Height);
-            MainConsole.Instance.Output("max/min/avg/sum: {0}/{1}/{2}/{3}", null, max, min, avg, sum);
+            MainConsole.Instance.Output("Channel {0}x{1}", m_channel.Width, m_channel.Height);
+            MainConsole.Instance.Output("max/min/avg/sum: {0}/{1}/{2}/{3}", max, min, avg, sum);
         }
 
         private void InterfaceEnableExperimentalBrushes(Object[] args)
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 131137e..4c922ba 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -799,7 +799,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 }
                 catch (Exception e)
                 {
-                    m_log.WarnFormat("[Warp3D]: Failed to decode texture {0} for prim {1} at {2}, exception {3} ", id.ToString(), sop.Name, sop.GetWorldPosition().ToString(), e.Message);
+                    m_log.WarnFormat("[Warp3D]: Failed to decode texture {0} for prim {1} at {2}, exception {3}", id.ToString(), sop.Name, sop.GetWorldPosition().ToString(), e.Message);
                 }
             }
             else
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index c9580d2..51faa0e 100755
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -265,7 +265,7 @@ namespace OpenSim.Region.CoreModules
                     else
                     {
                         MainConsole.Instance.Output(
-                            "Invalid value {0} specified for {1}", null, cmdparams[3], cmdparams[2]);
+                            "Invalid value {0} specified for {1}", cmdparams[3], cmdparams[2]);
 
                         return;
                     }
@@ -276,7 +276,7 @@ namespace OpenSim.Region.CoreModules
 
                     if (desiredPlugin.Equals(m_activeWindPlugin.Name))
                     {
-                        MainConsole.Instance.Output("Wind model plugin {0} is already active", null, cmdparams[3]);
+                        MainConsole.Instance.Output("Wind model plugin {0} is already active", cmdparams[3]);
 
                         return;
                     }
@@ -285,11 +285,11 @@ namespace OpenSim.Region.CoreModules
                     {
                         m_activeWindPlugin = m_availableWindPlugins[cmdparams[3]];
 
-                        MainConsole.Instance.Output("{0} wind model plugin now active", null, m_activeWindPlugin.Name);
+                        MainConsole.Instance.Output("{0} wind model plugin now active", m_activeWindPlugin.Name);
                     }
                     else
                     {
-                        MainConsole.Instance.Output("Could not find wind model plugin {0}", null, desiredPlugin);
+                        MainConsole.Instance.Output("Could not find wind model plugin {0}", desiredPlugin);
                     }
                     break;
             }
@@ -317,17 +317,17 @@ namespace OpenSim.Region.CoreModules
             {
                 if (!float.TryParse(cmdparams[3], out value))
                 {
-                    MainConsole.Instance.Output("Invalid value {0}", null, cmdparams[3]);
+                    MainConsole.Instance.Output("Invalid value {0}", cmdparams[3]);
                 }
 
                 try
                 {
                     WindParamSet(plugin, param, value);
-                    MainConsole.Instance.Output("{0} set to {1}", null, param, value);
+                    MainConsole.Instance.Output("{0} set to {1}", param, value);
                 }
                 catch (Exception e)
                 {
-                    MainConsole.Instance.Output("{0}", null, e.Message);
+                    MainConsole.Instance.Output("{0}", e.Message);
                 }
             }
             else
@@ -335,11 +335,11 @@ namespace OpenSim.Region.CoreModules
                 try
                 {
                     value = WindParamGet(plugin, param);
-                    MainConsole.Instance.Output("{0} : {1}", null, param, value);
+                    MainConsole.Instance.Output("{0} : {1}", param, value);
                 }
                 catch (Exception e)
                 {
-                    MainConsole.Instance.Output("{0}", null, e.Message);
+                    MainConsole.Instance.Output("{0}", e.Message);
                 }
             }