diff options
| author | Melanie | 2012-07-11 14:27:33 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-11 14:27:33 +0100 |
| commit | 89c9528e38b4e06a2af6231ced4ed733bbafa174 (patch) | |
| tree | aed380f4bc51d9102e593446762f476694b9d87c /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | remove expensive and leaked ( in Xengine at least) SayShout timer and (diff) | |
| download | opensim-SC_OLD-89c9528e38b4e06a2af6231ced4ed733bbafa174.zip opensim-SC_OLD-89c9528e38b4e06a2af6231ced4ed733bbafa174.tar.gz opensim-SC_OLD-89c9528e38b4e06a2af6231ced4ed733bbafa174.tar.bz2 opensim-SC_OLD-89c9528e38b4e06a2af6231ced4ed733bbafa174.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index b23d2e5..c3d66eb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -1824,6 +1824,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1824 | { | 1824 | { |
| 1825 | parentGroup.LinkToGroup(child); | 1825 | parentGroup.LinkToGroup(child); |
| 1826 | 1826 | ||
| 1827 | child.DetachFromBackup(); | ||
| 1828 | |||
| 1827 | // this is here so physics gets updated! | 1829 | // this is here so physics gets updated! |
| 1828 | // Don't remove! Bad juju! Stay away! or fix physics! | 1830 | // Don't remove! Bad juju! Stay away! or fix physics! |
| 1829 | child.AbsolutePosition = child.AbsolutePosition; | 1831 | child.AbsolutePosition = child.AbsolutePosition; |