19 files changed, 157 insertions, 166 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 73cfb9a..2328c49 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -351,7 +351,7 @@ namespace OpenSim
            m_moduleLoader = new ModuleLoader(m_config);
            ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/Startup");
-            m_log.Info(String.Format("[PLUGINS]: Loading {0} OpenSim application plugins", nodes.Count));
+            m_log.InfoFormat("[PLUGINS]: Loading {0} OpenSim application plugins", nodes.Count);
            foreach (TypeExtensionNode node in nodes)
            {
@@ -704,7 +704,7 @@ namespace OpenSim
                    m_console.Notice("set-time [x] - set the current scene time phase");
                    m_console.Notice("show assets - show state of asset cache.");
                    m_console.Notice("show users - show info about connected users.");
-                    m_console.Notice("show modules - shows info aboutloaded modules.");
+                    m_console.Notice("show modules - shows info about loaded modules.");
                    m_console.Notice("show stats - statistical information for this server not displayed in the client");
                    m_console.Notice("shutdown - disconnect all clients and shutdown.");
                    m_console.Notice("config set section field value - set a config value");
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index d7f4c3d..d4af98c 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -240,8 +240,8 @@ namespace OpenSim.Region.ClientStack
        {
            m_scene.RemoveClient(AgentId);
            
-            //m_log.Info(String.Format("[CLIENTVIEW] Memory pre  GC {0}", System.GC.GetTotalMemory(false)));
+            //m_log.InfoFormat("[CLIENTVIEW] Memory pre  GC {0}", System.GC.GetTotalMemory(false));
-            //m_log.Info(String.Format("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true)));   
+            //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true));   
            
            // Send the STOP packet 
            DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 656dd70..81689ed 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -73,9 +73,9 @@ namespace OpenSim.Region.Communications.OGS1
        {
            try
            {
-                m_log.Info(
+                m_log.InfoFormat(
-                    String.Format("[INVENTORY]: Requesting inventory from {0}/GetInventory/ for user {1}",
+                    "[INVENTORY]: Requesting inventory from {0}/GetInventory/ for user {1}",
-                                  _inventoryServerUrl, userID));
+                    _inventoryServerUrl, userID);
                RestObjectPosterResponse<InventoryCollection> requester
                    = new RestObjectPosterResponse<InventoryCollection>();
@@ -98,9 +98,9 @@ namespace OpenSim.Region.Communications.OGS1
            LLUUID userID = response.UserID;
            if (m_RequestingInventory.ContainsKey(userID))
            {
-                m_log.Info(String.Format("[INVENTORY]: " +
+                m_log.InfoFormat("[INVENTORY]: " +
-                                         "Received inventory response for user {0} containing {1} folders and {2} items",
+                                 "Received inventory response for user {0} containing {1} folders and {2} items",
-                                         userID, response.Folders.Count, response.AllItems.Count));
+                                 userID, response.Folders.Count, response.AllItems.Count);
                InventoryFolderImpl rootFolder = null;
                InventoryRequest request = m_RequestingInventory[userID];
@@ -134,10 +134,10 @@ namespace OpenSim.Region.Communications.OGS1
            }
            else
            {
-                m_log.Warn(
+                m_log.WarnFormat(
-                    String.Format("[INVENTORY]: " +
+                    "[INVENTORY]: " +
-                                  "Received inventory response for {0} for which we do not have a record of requesting!",
+                    "Received inventory response for {0} for which we do not have a record of requesting!",
-                                  userID));
+                    userID);
            }
        }
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index d4031d9..bc0bbaf 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment
            DynamicTextureModule dynamicModule = new DynamicTextureModule();
            if (m_loadedSharedModules.ContainsKey(dynamicModule.Name))
            {
-                m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule"));
+                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule");
            }
            else
            {
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment
            ChatModule chat = new ChatModule();
            if (m_loadedSharedModules.ContainsKey(chat.Name))
            {
-                m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule"));
+                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule");
            }
            else
            {
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment
            InstantMessageModule imMod = new InstantMessageModule();
            if (m_loadedSharedModules.ContainsKey(imMod.Name))
            {
-                m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule"));
+                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule");
            }
            else
            {
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Environment
            LoadImageURLModule loadMod = new LoadImageURLModule();
            if (m_loadedSharedModules.ContainsKey(loadMod.Name))
            {
-                m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule"));
+                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule");
            }
            else
            {
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment
            AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
            if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
            {
-                m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule"));
+                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
            }
            else
            {
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Environment
            XMLRPCModule xmlRpcMod = new XMLRPCModule();
            if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))
            {
-                m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule"));
+                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule");
            }
            else
            {
@@ -186,17 +186,17 @@ namespace OpenSim.Region.Environment
            if (modules.Length > 0)
            {
-                m_log.Info(String.Format("[MODULES]: Found Module Library [{0}]", dllName));
+                m_log.InfoFormat("[MODULES]: Found Module Library [{0}]", dllName);
                foreach (IRegionModule module in modules)
                {
                    if (!module.IsSharedModule)
                    {
-                        m_log.Info(String.Format("[MODULES]:    [{0}]: Initializing.", module.Name));
+                        m_log.InfoFormat("[MODULES]:    [{0}]: Initializing.", module.Name);
                        InitializeModule(module, scene);
                    }
                    else
                    {
-                        m_log.Info(String.Format("[MODULES]:    [{0}]: Loading Shared Module.", module.Name));
+                        m_log.InfoFormat("[MODULES]:    [{0}]: Loading Shared Module.", module.Name);
                        LoadSharedModule(module);
                    }
                }
@@ -246,7 +246,7 @@ namespace OpenSim.Region.Environment
                }
                catch (BadImageFormatException)
                {
-                    //m_log.Info(String.Format("[MODULES]: The file [{0}] is not a module assembly.", e.FileName));
+                    //m_log.InfoFormat("[MODULES]: The file [{0}] is not a module assembly.", e.FileName);
                }
            }
@@ -270,7 +270,7 @@ namespace OpenSim.Region.Environment
                }
                catch (ReflectionTypeLoadException)
                {
-                    m_log.Info(String.Format("[MODULES]: Could not load types for [{0}].", pluginAssembly.FullName));
+                    m_log.InfoFormat("[MODULES]: Could not load types for [{0}].", pluginAssembly.FullName);
                }
            }
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 4f877be..cf558e0 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.Modules
                // Make sure that any sender we currently have can get garbage collected
                sender = null;
                
-                //m_log.Info(String.Format("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count()));
+                //m_log.InfoFormat("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count());
            }
        }
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 999f4a2..32bc7c3 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -104,9 +104,9 @@ namespace OpenSim.Region.Environment.Modules
                        EnqueueTextureSender(textureSender);
                    }
                    
-                    //m_log.Info(String.Format("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID));
+                    //m_log.InfoFormat("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID);
                    m_textureSenders.Remove(textureID);                    
-                    //m_log.Info(String.Format("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count));
+                    //m_log.InfoFormat("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count);
                }
                else
                {
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 3a38bd2..19213fd 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -925,9 +925,9 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Info(String.Format("[SCENE]: " +
+                m_log.InfoFormat("[SCENE]: " +
-                                         "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!",
+                                 "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!",
-                                         primIds));
+                                 primIds);
            }
        }
@@ -975,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Warn(String.Format("[SCENE]: Attempted to duplicate nonexistant prim id {0}", GroupID));
+                m_log.WarnFormat("[SCENE]: Attempted to duplicate nonexistant prim id {0}", GroupID);
            }
        }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 28760fd..cc9d294 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -83,8 +83,8 @@ namespace OpenSim.Region.Environment.Scenes
            if (!TryGetAvatar(avatarId, out avatar))
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[AGENTINVENTORY]: Could not find avatar {0} to add inventory item", avatarId));
+                    "[AGENTINVENTORY]: Could not find avatar {0} to add inventory item", avatarId);
                return;
            }
@@ -146,10 +146,10 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[AGENTINVENTORY]: " +
+                    "[AGENTINVENTORY]: " +
-                                "Avatar {0} cannot be found to update its inventory item asset",
+                    "Avatar {0} cannot be found to update its inventory item asset",
-                                avatarId));
+                    avatarId);
            }
            return LLUUID.Zero;
@@ -171,10 +171,10 @@ namespace OpenSim.Region.Environment.Scenes
            SceneObjectGroup group = part.ParentGroup;            
            if (null == group)
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Prim inventory update requested for item ID {0} in prim ID {1} but this prim does not exist",
+                    "Prim inventory update requested for item ID {0} in prim ID {1} but this prim does not exist",
-                                itemId, primId));
+                    itemId, primId);
                return;
            }
@@ -220,10 +220,10 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Avatar {0} cannot be found to update its prim item asset",
+                    "Avatar {0} cannot be found to update its prim item asset",
-                                avatarId));
+                    avatarId);
            }
        }
@@ -498,8 +498,8 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID));
+                    "[PRIMINVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID);
            }
        }
@@ -524,11 +524,11 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Removal of item {0} requested of prim {1} but this prim does not exist",
+                    "Removal of item {0} requested of prim {1} but this prim does not exist",
-                                itemID,
+                    itemID,
-                                localID));
+                    localID);
            }
        }
@@ -548,18 +548,18 @@ namespace OpenSim.Region.Environment.Scenes
            {
                // TODO Retrieve itemID from client's inventory to pass on
                //group.AddInventoryItem(remoteClient, primLocalID, null);
-                m_log.Info(String.Format(
+                m_log.InfoFormat(
-                               "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                               "Non script prim inventory not yet implemented!"
+                    "Non script prim inventory not yet implemented!"
-                               + "\nUpdateTaskInventory called with item {0}, folder {1}, primLocalID {2}, user {3}",
+                    + "\nUpdateTaskInventory called with item {0}, folder {1}, primLocalID {2}, user {3}",
-                               itemID, folderID, primLocalID, remoteClient.Name));
+                    itemID, folderID, primLocalID, remoteClient.Name);
            }
            else
            {
-                m_log.Warn(String.Format(
+                m_log.WarnFormat(
-                               "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                               "Update with item {0} requested of prim {1} for {2} but this prim does not exist",
+                    "Update with item {0} requested of prim {1} for {2} but this prim does not exist",
-                               itemID, primLocalID, remoteClient.Name));
+                    itemID, primLocalID, remoteClient.Name);
            }
        }
@@ -604,18 +604,18 @@ namespace OpenSim.Region.Environment.Scenes
                        }
                        else
                        {
-                            m_log.Error(String.Format(
+                            m_log.ErrorFormat(
-                                            "[PRIMINVENTORY]: " +
+                                "[PRIMINVENTORY]: " +
-                                            "Could not rez script {0} into prim local ID {1} for user {2}"
+                                "Could not rez script {0} into prim local ID {1} for user {2}"
-                                            + " because the prim could not be found in the region!",
+                                + " because the prim could not be found in the region!",
-                                            item.inventoryName, localID, remoteClient.Name));
+                                item.inventoryName, localID, remoteClient.Name);
                        }
                    }
                    else
                    {
-                        m_log.Error(String.Format(
+                        m_log.ErrorFormat(
-                                        "[PRIMINVENTORY]: Could not find script inventory item {0} to rez for {1}!",
+                            "[PRIMINVENTORY]: Could not find script inventory item {0} to rez for {1}!",
-                                        itemID, remoteClient.Name));
+                            itemID, remoteClient.Name);
                    }
                }
            }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a4f5028..5026688 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1432,7 +1432,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                if (m_scenePresences.Remove(agentID))
                {
-                    //m_log.Info(String.Format("[SCENE] Removed scene presence {0}", agentID));
+                    //m_log.InfoFormat("[SCENE] Removed scene presence {0}", agentID);
                }
                else
                {
@@ -1445,7 +1445,7 @@ namespace OpenSim.Region.Environment.Scenes
            {
                if (Entities.Remove(agentID))
                {
-                    //m_log.Info(String.Format("[SCENE] Removed scene presence {0} from entities list", agentID));
+                    //m_log.InfoFormat("[SCENE] Removed scene presence {0} from entities list", agentID);
                }
                else
                {
@@ -1470,8 +1470,8 @@ namespace OpenSim.Region.Environment.Scenes
            // Remove client agent from profile, so new logins will work
            CommsManager.UserService.clearUserAgent(agentID);  
            
-            //m_log.Info(String.Format("[SCENE] Memory pre  GC {0}", System.GC.GetTotalMemory(false)));
+            //m_log.InfoFormat("[SCENE] Memory pre  GC {0}", System.GC.GetTotalMemory(false));
-            //m_log.Info(String.Format("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)));            
+            //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));            
        }
        public override void CloseAllAgents(uint circuitcode)
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 17d2959..0b88050 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -296,10 +296,10 @@ namespace OpenSim.Region.Environment.Scenes
                {
                    if (!scenePresence.IsChildAgent)
                    {
-                        m_log.Error(String.Format("Packet debug for {0} {1} set to {2}",
+                        m_log.ErrorFormat("Packet debug for {0} {1} set to {2}",
-                                                  scenePresence.Firstname,
+                                          scenePresence.Firstname,
-                                                  scenePresence.Lastname,
+                                          scenePresence.Lastname,
-                                                  newDebug));
+                                          newDebug);
                        scenePresence.ControllingClient.SetDebug(newDebug);
                    }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 6bd0575..e26ed5c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -55,10 +55,10 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
+                    "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
-                                localID, Name, UUID, itemID));
+                    localID, Name, UUID, itemID);
            }            
        }
        
@@ -76,10 +76,10 @@ namespace OpenSim.Region.Environment.Scenes
 //            }
 //            else
 //            {
-//                m_log.Error(String.Format(
+//                m_log.ErrorFormat(
-//                                "[PRIMINVENTORY]: " +
+//                    "[PRIMINVENTORY]: " +
-//                                "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
+//                    "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
-//                                localID, Name, UUID, itemID));
+//                    localID, Name, UUID, itemID);
 //            }            
 //        }        
        
@@ -123,10 +123,10 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}",
+                    "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}",
-                                partID, Name, UUID, itemID));
+                    partID, Name, UUID, itemID);
            }            
        }         
        
@@ -144,10 +144,10 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory",
+                    "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory",
-                                localID, Name, UUID));
+                    localID, Name, UUID);
            }
            return false;
        }
@@ -161,10 +161,10 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Couldn't find part {0} in object group {1}, {2} to request inventory data",
+                    "Couldn't find part {0} in object group {1}, {2} to request inventory data",
-                                localID, Name, UUID));
+                    localID, Name, UUID);
            }
        }
@@ -200,10 +200,10 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}",
+                    "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}",
-                                localID, Name, UUID, newItemId));
+                    localID, Name, UUID, newItemId);
            }
            return false;
@@ -224,10 +224,10 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}",
+                    "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}",
-                                primID, part.Name, part.UUID, itemID));
+                    primID, part.Name, part.UUID, itemID);
            }   
            
            return null;
@@ -250,10 +250,10 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Couldn't find prim ID {0} to update item {1}, {2}",
+                    "Couldn't find prim ID {0} to update item {1}, {2}",
-                                item.ParentPartID, item.Name, item.ItemID));
+                    item.ParentPartID, item.Name, item.ItemID);
            }   
            
            return false;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 5ae657e..c204389 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1003,9 +1003,9 @@ namespace OpenSim.Region.Environment.Scenes
            }
            else
            {
-                m_log.Info(String.Format("[SCENE]: " +
+                m_log.InfoFormat("[SCENE]: " +
-                                         "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}",
+                                 "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}",
-                                         partID, LocalId));
+                                 partID, LocalId);
            }
        }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 62c3436..a27432d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -147,10 +147,10 @@ namespace OpenSim.Region.Environment.Scenes
        /// <returns></returns>
        public void StartScript(TaskInventoryItem item)
        {
-//            m_log.Info(String.Format(
+//            m_log.InfoFormat(
-//                           "[PRIMINVENTORY]: " +
+//                "[PRIMINVENTORY]: " +
-//                           "Starting script {0}, {1} in prim {2}, {3}", 
+//                "Starting script {0}, {1} in prim {2}, {3}", 
-//                           item.Name, item.ItemID, Name, UUID));
+//                item.Name, item.ItemID, Name, UUID);
            AddFlag(LLObject.ObjectFlags.Scripted);
            if (!((m_parentGroup.Scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts))
@@ -166,10 +166,10 @@ namespace OpenSim.Region.Environment.Scenes
                }
                else
                {
-                    m_log.Error(String.Format(
+                    m_log.ErrorFormat(
-                                    "[PRIMINVENTORY]: " +
+                        "[PRIMINVENTORY]: " +
-                                    "Couldn't start script {0}, {1} since asset ID {2} could not be found",
+                        "Couldn't start script {0}, {1} since asset ID {2} could not be found",
-                                    item.Name, item.ItemID, item.AssetID));
+                        item.Name, item.ItemID, item.AssetID);
                }
            }
            ScheduleFullUpdate();
@@ -192,10 +192,10 @@ namespace OpenSim.Region.Environment.Scenes
                }            
                else
                {
-                    m_log.Error(String.Format(
+                    m_log.ErrorFormat(
-                                    "[PRIMINVENTORY]: " +
+                        "[PRIMINVENTORY]: " +
-                                    "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}", 
+                        "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}", 
-                                    itemId, Name, UUID));
+                        itemId, Name, UUID);
                }                
            }
        }        
@@ -206,27 +206,18 @@ namespace OpenSim.Region.Environment.Scenes
        /// <param name="itemId"></param>        
        public void StopScript(LLUUID itemId)
        {
-            
            if (m_taskInventory.ContainsKey(itemId))
            {
-                
                m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalID, itemId);
                m_parentGroup.AddActiveScriptCount(-1);
-                
-                
-                
-                
-                
            }            
            else
            {
-                m_log.Error(String.Format(
+                m_log.ErrorFormat(
-                                "[PRIMINVENTORY]: " +
+                    "[PRIMINVENTORY]: " +
-                                "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2}", 
+                    "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2}", 
-                                itemId, Name, UUID));
+                    itemId, Name, UUID);
            }
-                           
        }        
        /// <summary>
@@ -285,10 +276,10 @@ namespace OpenSim.Region.Environment.Scenes
                }
                else
                {
-                    m_log.Error(String.Format(
+                    m_log.ErrorFormat(
-                                    "[PRIMINVENTORY]: " +
+                        "[PRIMINVENTORY]: " +
-                                    "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
+                        "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
-                                    itemID, Name, UUID));
+                        itemID, Name, UUID);
                }
            }
@@ -317,10 +308,10 @@ namespace OpenSim.Region.Environment.Scenes
                }
                else
                {
-                    m_log.Error(String.Format(
+                    m_log.ErrorFormat(
-                                    "[PRIMINVENTORY]: " +
+                        "[PRIMINVENTORY]: " +
-                                    "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
+                        "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
-                                    item.ItemID, Name, UUID));
+                        item.ItemID, Name, UUID);
                }   
            }
            
@@ -374,10 +365,10 @@ namespace OpenSim.Region.Environment.Scenes
                }
                else
                {
-                    m_log.Error(String.Format(
+                    m_log.ErrorFormat(
-                                    "[PRIMINVENTORY]: " +
+                        "[PRIMINVENTORY]: " +
-                                    "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
+                        "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
-                                    itemID, Name, UUID));
+                        itemID, Name, UUID);
                }            
            }
@@ -442,8 +433,8 @@ namespace OpenSim.Region.Environment.Scenes
            
            fileData = Helpers.StringToField(invString.BuildString);
            
-//            m_log.Info(String.Format(
+//            m_log.InfoFormat(
-//                           "[PRIMINVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData)));
+//                "[PRIMINVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData));
            
            if (fileData.Length > 2)
            {
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index acaa389b..82eef35 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Physics.Manager
            }
            else
            {
-                m_log.Warn(String.Format("[PHYSICS]: couldn't find meshingEngine: {0}", meshEngineName));
+                m_log.WarnFormat("[PHYSICS]: couldn't find meshingEngine: {0}", meshEngineName);
                throw new ArgumentException(String.Format("couldn't find meshingEngine: {0}", meshEngineName));
            }
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index bd2ad99..00c0ff1 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Physics.Manager
            public override PhysicsActor AddAvatar(string avName, PhysicsVector position)
            {
-                m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position));
+                m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
                return PhysicsActor.Null;
            }
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.Manager
 /*
            public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
            {
-                m_log.Info(String.Format("NullPhysicsScene : AddPrim({0},{1})", position, size));
+                m_log.InfoFormat("NullPhysicsScene : AddPrim({0},{1})", position, size);
                return PhysicsActor.Null;
            }
 */
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Physics.Manager
            public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position,
                                                      PhysicsVector size, Quaternion rotation, bool isPhysical)
            {
-                m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size));
+                m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size);
                return PhysicsActor.Null;
            }
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Physics.Manager
            public override void SetTerrain(float[] heightMap)
            {
-                m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length));
+                m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
            }
            public override void DeleteTerrain()
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 641e25d..a394ffb 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Physics.Meshing
                    // Calculated separately to avoid errors
                cutHull.AddVertex(legEnd);
-                //m_log.Debug(String.Format("Starting cutting of the hollow shape from the prim {1}", 0, primName));
+                //m_log.DebugFormat("Starting cutting of the hollow shape from the prim {1}", 0, primName);
                SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull);
                outerHull = cuttedHull;
@@ -520,7 +520,7 @@ namespace OpenSim.Region.Physics.Meshing
                // Calculated separately to avoid errors
                cutHull.AddVertex(legEnd);
-                m_log.Debug(String.Format("Starting cutting of the hollow shape from the prim {1}", 0, primName));
+                m_log.DebugFormat("Starting cutting of the hollow shape from the prim {1}", 0, primName);
                SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull);
                outerHull = cuttedHull;
diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
index e9cce3b..91df98f 100644
--- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs
+++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
@@ -246,8 +246,8 @@ namespace OpenSim.Region.Physics.Meshing
            bool intersects = false;
            //m_log.Debug("State before intersection detection");
-            //m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString()));
+            //m_log.DebugFormat("The baseHull is:\n{1}", 0, baseHullClone.ToString());
-            //m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString()));
+            //m_log.DebugFormat("The otherHull is:\n{1}", 0, otherHullClone.ToString());
            {
                int iBase, iOther;
@@ -277,7 +277,7 @@ namespace OpenSim.Region.Physics.Meshing
            }
            //m_log.Debug("State after intersection detection for the base hull");
-            //m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString()));
+            //m_log.DebugFormat("The baseHull is:\n{1}", 0, baseHullClone.ToString());
            {
                int iOther, iBase;
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Physics.Meshing
            }
            //m_log.Debug("State after intersection detection for the base hull");
-            //m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString()));
+            //m_log.DebugFormat("The otherHull is:\n{1}", 0, otherHullClone.ToString());
            bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone);
@@ -389,7 +389,7 @@ namespace OpenSim.Region.Physics.Meshing
                    done = true;
            }
-            //m_log.Debug(String.Format("The resulting Hull is:\n{1}", 0, result.ToString()));
+            //m_log.DebugFormat("The resulting Hull is:\n{1}", 0, result.ToString());
            return result;
        }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index b407f8d..68ac99c 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource);
 #if DEBUG
-                m_scriptEngine.Log.Debug(String.Format("[" + m_scriptEngine.ScriptEngineName + "]: Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before));
+                m_scriptEngine.Log.DebugFormat("[" + m_scriptEngine.ScriptEngineName + "]: Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before);
 #endif
                CompiledScript.Source = Script;
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index 6a79c8a..0343b79 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -142,7 +142,7 @@ namespace OpenSim.DataStore.MSSQL
        public void RemoveObject(LLUUID obj, LLUUID regionUUID)
        {
-            m_log.Info(String.Format("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID));
+            m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
            
            DataTable prims = ds.Tables["prims"];
            DataTable shapes = ds.Tables["primshapes"];