diff options
author | Melanie | 2012-02-07 23:30:48 +0000 |
---|---|---|
committer | Melanie | 2012-02-07 23:30:48 +0000 |
commit | 236e1c45f2f484aa97d5faae149dbc304608f592 (patch) | |
tree | f6bcc2b3ceae99a7789a5dc22e5fecfcfe8505e2 /OpenSim/Region/Framework | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
parent | Set UseMeshiesPhysicsMesh = true in [Mesh] by default (diff) | |
download | opensim-SC_OLD-236e1c45f2f484aa97d5faae149dbc304608f592.zip opensim-SC_OLD-236e1c45f2f484aa97d5faae149dbc304608f592.tar.gz opensim-SC_OLD-236e1c45f2f484aa97d5faae149dbc304608f592.tar.bz2 opensim-SC_OLD-236e1c45f2f484aa97d5faae149dbc304608f592.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 34e0ab7..46c4d7b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -664,7 +664,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
664 | 664 | ||
665 | // ~SceneObjectGroup() | 665 | // ~SceneObjectGroup() |
666 | // { | 666 | // { |
667 | // m_log.DebugFormat("[SCENE OBJECT GROUP]: Destructor called for {0}, local id {1}", Name, LocalId); | 667 | // //m_log.DebugFormat("[SCENE OBJECT GROUP]: Destructor called for {0}, local id {1}", Name, LocalId); |
668 | // Console.WriteLine("Destructor called for {0}, local id {1}", Name, LocalId); | ||
668 | // } | 669 | // } |
669 | 670 | ||
670 | #region Constructors | 671 | #region Constructors |