diff options
author | Justin Clarke Casey | 2008-06-27 15:04:35 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-27 15:04:35 +0000 |
commit | 61750213004431c078d5402f20269dbe4a5232c4 (patch) | |
tree | 454c01b9076473379248591ad198136697e03f68 | |
parent | somehow, I seem to have actually made appearance persistant (diff) | |
download | opensim-SC_OLD-61750213004431c078d5402f20269dbe4a5232c4.zip opensim-SC_OLD-61750213004431c078d5402f20269dbe4a5232c4.tar.gz opensim-SC_OLD-61750213004431c078d5402f20269dbe4a5232c4.tar.bz2 opensim-SC_OLD-61750213004431c078d5402f20269dbe4a5232c4.tar.xz |
* refactor: Remove group changed responsibilty from ScheduleGroupForTerseUpdate
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 0fa76fa..b903674 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -1551,8 +1551,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1551 | /// </summary> | 1551 | /// </summary> |
1552 | public void ScheduleGroupForTerseUpdate() | 1552 | public void ScheduleGroupForTerseUpdate() |
1553 | { | 1553 | { |
1554 | HasGroupChanged = true; | ||
1555 | |||
1556 | lock (m_parts) | 1554 | lock (m_parts) |
1557 | { | 1555 | { |
1558 | foreach (SceneObjectPart part in m_parts.Values) | 1556 | foreach (SceneObjectPart part in m_parts.Values) |
@@ -2165,7 +2163,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2165 | m_scene.PhysicsScene.AddPhysicsActorTaint(part.PhysActor); | 2163 | m_scene.PhysicsScene.AddPhysicsActorTaint(part.PhysActor); |
2166 | } | 2164 | } |
2167 | 2165 | ||
2168 | 2166 | HasGroupChanged = true; | |
2169 | ScheduleGroupForTerseUpdate(); | 2167 | ScheduleGroupForTerseUpdate(); |
2170 | } | 2168 | } |
2171 | } | 2169 | } |
@@ -2254,6 +2252,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
2254 | } | 2252 | } |
2255 | 2253 | ||
2256 | AbsolutePosition = newPos; | 2254 | AbsolutePosition = newPos; |
2255 | |||
2256 | HasGroupChanged = true; | ||
2257 | ScheduleGroupForTerseUpdate(); | 2257 | ScheduleGroupForTerseUpdate(); |
2258 | } | 2258 | } |
2259 | 2259 | ||
@@ -2280,6 +2280,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
2280 | m_rootPart.RotationOffset.Z); | 2280 | m_rootPart.RotationOffset.Z); |
2281 | m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); | 2281 | m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); |
2282 | } | 2282 | } |
2283 | |||
2284 | HasGroupChanged = true; | ||
2283 | ScheduleGroupForTerseUpdate(); | 2285 | ScheduleGroupForTerseUpdate(); |
2284 | } | 2286 | } |
2285 | 2287 | ||
@@ -2299,6 +2301,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
2299 | m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); | 2301 | m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); |
2300 | } | 2302 | } |
2301 | AbsolutePosition = pos; | 2303 | AbsolutePosition = pos; |
2304 | |||
2305 | HasGroupChanged = true; | ||
2302 | ScheduleGroupForTerseUpdate(); | 2306 | ScheduleGroupForTerseUpdate(); |
2303 | } | 2307 | } |
2304 | 2308 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 85e098d..94d661c 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -2190,6 +2190,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2190 | { | 2190 | { |
2191 | //StoreUndoState(); | 2191 | //StoreUndoState(); |
2192 | RotationOffset = new LLQuaternion(rot.X, rot.Y, rot.Z, rot.W); | 2192 | RotationOffset = new LLQuaternion(rot.X, rot.Y, rot.Z, rot.W); |
2193 | ParentGroup.HasGroupChanged = true; | ||
2193 | ScheduleTerseUpdate(); | 2194 | ScheduleTerseUpdate(); |
2194 | } | 2195 | } |
2195 | } | 2196 | } |