aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-02-18 17:42:14 +0000
committerUbitUmarov2012-02-18 17:42:14 +0000
commit3aee642190add7045f78e522ae7b2221b3566f1e (patch)
treea390b28dce297bde43aa216332d217b2b28ea03a /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parent vehicle parameters do cross (i hope) on regions in same instance ( others ne... (diff)
downloadopensim-SC-3aee642190add7045f78e522ae7b2221b3566f1e.zip
opensim-SC-3aee642190add7045f78e522ae7b2221b3566f1e.tar.gz
opensim-SC-3aee642190add7045f78e522ae7b2221b3566f1e.tar.bz2
opensim-SC-3aee642190add7045f78e522ae7b2221b3566f1e.tar.xz
changed how vehicle data is stored and passed to physics. use unsafe in serializer, tried to control m_dupeInProgress
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 324fdb8..1cce4c0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1965,6 +1965,7 @@ namespace OpenSim.Region.Framework.Scenes
1965 /// <returns></returns> 1965 /// <returns></returns>
1966 public SceneObjectGroup Copy(bool userExposed) 1966 public SceneObjectGroup Copy(bool userExposed)
1967 { 1967 {
1968 m_dupeInProgress = true;
1968 SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone(); 1969 SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
1969 dupe.m_isBackedUp = false; 1970 dupe.m_isBackedUp = false;
1970 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>(); 1971 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
@@ -2048,6 +2049,7 @@ namespace OpenSim.Region.Framework.Scenes
2048 ScheduleGroupForFullUpdate(); 2049 ScheduleGroupForFullUpdate();
2049 } 2050 }
2050 2051
2052 m_dupeInProgress = false;
2051 return dupe; 2053 return dupe;
2052 } 2054 }
2053 2055