diff options
| author | Melanie | 2012-10-30 01:02:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-30 01:02:20 +0000 |
| commit | 48569e856a9c9ced207652b10e2abde94c849687 (patch) | |
| tree | 8955c0206f1822f4bbb44466fae74e18923d125c /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Make MeshAssetReceived private. (diff) | |
| download | opensim-SC_OLD-48569e856a9c9ced207652b10e2abde94c849687.zip opensim-SC_OLD-48569e856a9c9ced207652b10e2abde94c849687.tar.gz opensim-SC_OLD-48569e856a9c9ced207652b10e2abde94c849687.tar.bz2 opensim-SC_OLD-48569e856a9c9ced207652b10e2abde94c849687.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 870bd66..285d1ae 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -75,8 +75,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 75 | { | 75 | { |
| 76 | // ~ScenePresence() | 76 | // ~ScenePresence() |
| 77 | // { | 77 | // { |
| 78 | // m_log.Debug("[SCENE PRESENCE] Destructor called"); | 78 | // m_log.DebugFormat("[SCENE PRESENCE]: Destructor called on {0}", Name); |
| 79 | // } | 79 | // } |
| 80 | |||
| 80 | private void TriggerScenePresenceUpdated() | 81 | private void TriggerScenePresenceUpdated() |
| 81 | { | 82 | { |
| 82 | if (m_scene != null) | 83 | if (m_scene != null) |