diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs index 432708c..8079e79 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs | |||
| @@ -37,7 +37,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
| 37 | class NullPhysicsScene : PhysicsScene | 37 | class NullPhysicsScene : PhysicsScene |
| 38 | { | 38 | { |
| 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 40 | 40 | ||
| 41 | private static int m_workIndicator; | 41 | private static int m_workIndicator; |
| 42 | 42 | ||
| 43 | public override PhysicsActor AddAvatar( | 43 | public override PhysicsActor AddAvatar( |