diff options
author | Melanie Thielker | 2010-09-14 22:14:23 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-09-14 22:14:23 +0200 |
commit | 540a1912cea13f42b3fb6f4e4152de2be46f062c (patch) | |
tree | 1ba8209dc0f40780181499be8556c8fe6fc97ceb /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Adjust the code for ghost prim removal to new information from Kitto (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-540a1912cea13f42b3fb6f4e4152de2be46f062c.zip opensim-SC_OLD-540a1912cea13f42b3fb6f4e4152de2be46f062c.tar.gz opensim-SC_OLD-540a1912cea13f42b3fb6f4e4152de2be46f062c.tar.bz2 opensim-SC_OLD-540a1912cea13f42b3fb6f4e4152de2be46f062c.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index e933e77..52f6c1a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1800,9 +1800,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1800 | } | 1800 | } |
1801 | } | 1801 | } |
1802 | } | 1802 | } |
1803 | // m_log.DebugFormat( | 1803 | // m_log.DebugFormat( |
1804 | // "[SCENE]: Storing {0}, {1} in {2}", | 1804 | // "[SCENE]: Storing {0}, {1} in {2}", |
1805 | // Name, UUID, m_scene.RegionInfo.RegionName); | 1805 | // Name, UUID, m_scene.RegionInfo.RegionName); |
1806 | 1806 | ||
1807 | SceneObjectGroup backup_group = Copy(false); | 1807 | SceneObjectGroup backup_group = Copy(false); |
1808 | backup_group.RootPart.Velocity = RootPart.Velocity; | 1808 | backup_group.RootPart.Velocity = RootPart.Velocity; |