diff options
author | Jeff Ames | 2008-02-13 03:38:18 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-13 03:38:18 +0000 |
commit | 001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6 (patch) | |
tree | 35f528caf55171c0c53cd81501ebaa22f31e0d2a /OpenSim/Region | |
parent | * Clean up LIBRARY INVENTORY messages (diff) | |
download | opensim-SC-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.zip opensim-SC-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.tar.gz opensim-SC-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.tar.bz2 opensim-SC-001ce95e4c4bf4f0929c2ced4ab22e3bc40fd1d6.tar.xz |
Clean up more unnecessary String.Format calls
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 2 |
3 files changed, 10 insertions, 15 deletions
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 | |||
600 | group.StartScript(localID, copyID); | 600 | group.StartScript(localID, copyID); |
601 | group.GetProperties(remoteClient); | 601 | group.GetProperties(remoteClient); |
602 | 602 | ||
603 | // m_log.Info( | 603 | // m_log.InfoFormat("[PRIMINVENTORY]: " + |
604 | // String.Format("[PRIMINVENTORY]: " + | 604 | // "Rezzed script {0} into prim local ID {1} for user {2}", |
605 | // "Rezzed script {0} into prim local ID {1} for user {2}", | 605 | // item.inventoryName, localID, remoteClient.Name); |
606 | // item.inventoryName, localID, remoteClient.Name)); | ||
607 | } | 606 | } |
608 | else | 607 | else |
609 | { | 608 | { |
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 | |||
1477 | } | 1477 | } |
1478 | else | 1478 | else |
1479 | { | 1479 | { |
1480 | m_log.Warn( | 1480 | m_log.WarnFormat("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene ScenePresences list", agentID); |
1481 | String.Format("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene ScenePresences list", agentID)); | ||
1482 | } | 1481 | } |
1483 | } | 1482 | } |
1484 | 1483 | ||
@@ -1490,8 +1489,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1490 | } | 1489 | } |
1491 | else | 1490 | else |
1492 | { | 1491 | { |
1493 | m_log.Warn( | 1492 | m_log.WarnFormat("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene Entities list", agentID); |
1494 | String.Format("[SCENE] Tried to remove non-existent scene prescence with agent ID {0} from scene Entities list", agentID)); | ||
1495 | } | 1493 | } |
1496 | } | 1494 | } |
1497 | 1495 | ||
@@ -2302,21 +2300,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
2302 | { | 2300 | { |
2303 | case "users": | 2301 | case "users": |
2304 | m_log.Error("Current Region: " + RegionInfo.RegionName); | 2302 | m_log.Error("Current Region: " + RegionInfo.RegionName); |
2305 | m_log.Error( | 2303 | m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", |
2306 | String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", | 2304 | "Agent ID", "Session ID", "Circuit", "IP", "World"); |
2307 | "Agent ID", "Session ID", "Circuit", "IP", "World")); | ||
2308 | 2305 | ||
2309 | foreach (ScenePresence scenePrescence in GetAvatars()) | 2306 | foreach (ScenePresence scenePrescence in GetAvatars()) |
2310 | { | 2307 | { |
2311 | m_log.Error( | 2308 | m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", |
2312 | String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", | ||
2313 | scenePrescence.Firstname, | 2309 | scenePrescence.Firstname, |
2314 | scenePrescence.Lastname, | 2310 | scenePrescence.Lastname, |
2315 | scenePrescence.UUID, | 2311 | scenePrescence.UUID, |
2316 | scenePrescence.ControllingClient.AgentId, | 2312 | scenePrescence.ControllingClient.AgentId, |
2317 | "Unknown", | 2313 | "Unknown", |
2318 | "Unknown", | 2314 | "Unknown", |
2319 | RegionInfo.RegionName)); | 2315 | RegionInfo.RegionName); |
2320 | } | 2316 | } |
2321 | break; | 2317 | break; |
2322 | case "modules": | 2318 | 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 | |||
80 | } | 80 | } |
81 | else | 81 | else |
82 | { | 82 | { |
83 | m_log.Warn(String.Format("[PHYSICS]: couldn't find physicsEngine: {0}", physEngineName)); | 83 | m_log.WarnFormat("[PHYSICS]: couldn't find physicsEngine: {0}", physEngineName); |
84 | throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}", physEngineName)); | 84 | throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}", physEngineName)); |
85 | } | 85 | } |
86 | } | 86 | } |