From 001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 13 Feb 2008 03:38:18 +0000
Subject: Clean up more unnecessary String.Format calls

---
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs   |  7 +++----
 OpenSim/Region/Environment/Scenes/Scene.cs             | 16 ++++++----------
 OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 6800d5f..952b039 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -600,10 +600,9 @@ namespace OpenSim.Region.Environment.Scenes
                             group.StartScript(localID, copyID);
                             group.GetProperties(remoteClient);
     
-    //                        m_log.Info(
-    //                            String.Format("[PRIMINVENTORY]: " +
-    //                                          "Rezzed script {0} into prim local ID {1} for user {2}",
-    //                                          item.inventoryName, localID, remoteClient.Name));
+    //                        m_log.InfoFormat("[PRIMINVENTORY]: " +
+    //                                         "Rezzed script {0} into prim local ID {1} for user {2}",
+    //                                         item.inventoryName, localID, remoteClient.Name);
                         }
                         else
                         {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d763d35..c41979c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1477,8 +1477,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
                 else
                 {
-                    m_log.Warn(
-                        String.Format("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene ScenePresences list", agentID));
+                    m_log.WarnFormat("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene ScenePresences list", agentID);
                 }
             }
 
@@ -1490,8 +1489,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
                 else
                 {
-                    m_log.Warn(
-                        String.Format("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene Entities list", agentID));
+                    m_log.WarnFormat("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene Entities list", agentID);
                 }
             }
 
@@ -2302,21 +2300,19 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 case "users":
                     m_log.Error("Current Region: " + RegionInfo.RegionName);
-                    m_log.Error(
-                        String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname",
-                                      "Agent ID", "Session ID", "Circuit", "IP", "World"));
+                    m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname",
+                                      "Agent ID", "Session ID", "Circuit", "IP", "World");
 
                     foreach (ScenePresence scenePrescence in GetAvatars())
                     {
-                        m_log.Error(
-                            String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
+                        m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
                                           scenePrescence.Firstname,
                                           scenePrescence.Lastname,
                                           scenePrescence.UUID,
                                           scenePrescence.ControllingClient.AgentId,
                                           "Unknown",
                                           "Unknown",
-                                          RegionInfo.RegionName));
+                                          RegionInfo.RegionName);
                     }
                     break;
                 case "modules":
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 82eef35..76ea503 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Physics.Manager
             }
             else
             {
-                m_log.Warn(String.Format("[PHYSICS]: couldn't find physicsEngine: {0}", physEngineName));
+                m_log.WarnFormat("[PHYSICS]: couldn't find physicsEngine: {0}", physEngineName);
                 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}", physEngineName));
             }
         }
-- 
cgit v1.1