diff options
| author | Melanie | 2010-09-14 22:14:08 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-14 22:14:08 +0100 |
| commit | 2f41bc4ca738cd27730639c8cd49a154404c6a82 (patch) | |
| tree | 9d18eef4fb56a86c532699ae9486b6b4e6b31e3e /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-2f41bc4ca738cd27730639c8cd49a154404c6a82.zip opensim-SC-2f41bc4ca738cd27730639c8cd49a154404c6a82.tar.gz opensim-SC-2f41bc4ca738cd27730639c8cd49a154404c6a82.tar.bz2 opensim-SC-2f41bc4ca738cd27730639c8cd49a154404c6a82.tar.xz | |
Fix merge issues
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index caf376b..ed92d86 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -4330,8 +4330,8 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju | |||
| 4330 | } | 4330 | } |
| 4331 | 4331 | ||
| 4332 | m_log.InfoFormat( | 4332 | m_log.InfoFormat( |
| 4333 | "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2} ({3})", | 4333 | "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {3}", |
| 4334 | p, itemID, assetID, asset); | 4334 | p, itemID, asset); |
| 4335 | } | 4335 | } |
| 4336 | catch (Exception e) | 4336 | catch (Exception e) |
| 4337 | { | 4337 | { |