remove some more useless NULL arguments

3 files changed, 6 insertions, 7 deletions

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);