aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorJeff Ames2008-05-06 22:41:38 +0000
committerJeff Ames2008-05-06 22:41:38 +0000
commit0ea48cf7860a83e30e4401b4bb1ff4b4eb3ae3a7 (patch)
tree92221f03df2e93be0399a008ba4927977067a888 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parentsend actual velocity and angular velocity in terse updates (diff)
downloadopensim-SC-0ea48cf7860a83e30e4401b4bb1ff4b4eb3ae3a7.zip
opensim-SC-0ea48cf7860a83e30e4401b4bb1ff4b4eb3ae3a7.tar.gz
opensim-SC-0ea48cf7860a83e30e4401b4bb1ff4b4eb3ae3a7.tar.bz2
opensim-SC-0ea48cf7860a83e30e4401b4bb1ff4b4eb3ae3a7.tar.xz
De-tabify source.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs17
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 2bc7fd3..033a419 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -186,8 +186,6 @@ namespace OpenSim.Region.Environment.Scenes
186 string.Format("[SCENE OBJECT GROUP]: Object {0} has no root part.", m_uuid)); 186 string.Format("[SCENE OBJECT GROUP]: Object {0} has no root part.", m_uuid));
187 } 187 }
188 188
189
190
191 return m_rootPart.GroupPosition; 189 return m_rootPart.GroupPosition;
192 } 190 }
193 set 191 set
@@ -198,7 +196,6 @@ namespace OpenSim.Region.Environment.Scenes
198 m_scene.CrossPrimGroupIntoNewRegion(val, this); 196 m_scene.CrossPrimGroupIntoNewRegion(val, this);
199 } 197 }
200 198
201
202 lock (m_parts) 199 lock (m_parts)
203 { 200 {
204 foreach (SceneObjectPart part in m_parts.Values) 201 foreach (SceneObjectPart part in m_parts.Values)
@@ -969,19 +966,19 @@ namespace OpenSim.Region.Environment.Scenes
969 966
970 public void aggregateScriptEvents() 967 public void aggregateScriptEvents()
971 { 968 {
972 uint objectflagupdate=(uint)RootPart.GetEffectiveObjectFlags(); 969 uint objectflagupdate=(uint)RootPart.GetEffectiveObjectFlags();
973 970
974 scriptEvents aggregateScriptEvents=0; 971 scriptEvents aggregateScriptEvents=0;
975 972
976 lock (m_parts) 973 lock (m_parts)
977 { 974 {
978 foreach (SceneObjectPart part in m_parts.Values) 975 foreach (SceneObjectPart part in m_parts.Values)
979 { 976 {
980 if(part == null) 977 if (part == null)
981 continue; 978 continue;
982 if(part != RootPart) 979 if (part != RootPart)
983 part.ObjectFlags = objectflagupdate; 980 part.ObjectFlags = objectflagupdate;
984 aggregateScriptEvents |= part.m_aggregateScriptEvents; 981 aggregateScriptEvents |= part.m_aggregateScriptEvents;
985 } 982 }
986 } 983 }
987 984