diff options
author | Oren Hurvitz | 2015-07-05 15:56:45 +0300 |
---|---|---|
committer | Oren Hurvitz | 2015-08-11 06:16:23 +0100 |
commit | 373455a6fa8b7f7329fb02bc43de257df2410191 (patch) | |
tree | 0714439090f8f9160eefd96e20911a51ba9a9b92 | |
parent | BulletSim: rearrange code and add different locking to eliminate chances (diff) | |
download | opensim-SC_OLD-373455a6fa8b7f7329fb02bc43de257df2410191.zip opensim-SC_OLD-373455a6fa8b7f7329fb02bc43de257df2410191.tar.gz opensim-SC_OLD-373455a6fa8b7f7329fb02bc43de257df2410191.tar.bz2 opensim-SC_OLD-373455a6fa8b7f7329fb02bc43de257df2410191.tar.xz |
Fixed mistakes in string format specifiers (e.g., "{0)" instead of {0}")
-rw-r--r-- | OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs index 9413f09..e95889d 100644 --- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs +++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | |||
@@ -233,7 +233,7 @@ namespace OpenSim.Region.OptionalModules.Materials | |||
233 | GetStoredMaterialInFace(part, te.DefaultTexture); | 233 | GetStoredMaterialInFace(part, te.DefaultTexture); |
234 | else | 234 | else |
235 | m_log.WarnFormat( | 235 | m_log.WarnFormat( |
236 | "[Materials]: Default texture for part {0} (part of object {1)) in {2} unexpectedly null. Ignoring.", | 236 | "[Materials]: Default texture for part {0} (part of object {1}) in {2} unexpectedly null. Ignoring.", |
237 | part.Name, part.ParentGroup.Name, m_scene.Name); | 237 | part.Name, part.ParentGroup.Name, m_scene.Name); |
238 | 238 | ||
239 | foreach (Primitive.TextureEntryFace face in te.FaceTextures) | 239 | foreach (Primitive.TextureEntryFace face in te.FaceTextures) |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 1a95f91..8a19944 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -409,7 +409,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
409 | 409 | ||
410 | if (ret == null) | 410 | if (ret == null) |
411 | { | 411 | { |
412 | m_log.ErrorFormat("{0) COULD NOT SELECT BULLET ENGINE: '[BulletSim]PhysicsEngine' must be either 'BulletUnmanaged-*' or 'BulletXNA-*'", LogHeader); | 412 | m_log.ErrorFormat("{0} COULD NOT SELECT BULLET ENGINE: '[BulletSim]PhysicsEngine' must be either 'BulletUnmanaged-*' or 'BulletXNA-*'", LogHeader); |
413 | } | 413 | } |
414 | else | 414 | else |
415 | { | 415 | { |