Merge branch 'dev' into dsg

dsg
Dan Lake 2011-07-25 10:14:57 -07:00
commit b844abf852
2 changed files with 2 additions and 1 deletions

View File

@ -5341,12 +5341,13 @@ namespace OpenSim.Region.Framework.Scenes
allProperties.Add(SceneObjectPartSyncProperties.RotationOffset); allProperties.Add(SceneObjectPartSyncProperties.RotationOffset);
allProperties.Add(SceneObjectPartSyncProperties.AngularVelocity); allProperties.Add(SceneObjectPartSyncProperties.AngularVelocity);
allProperties.Add(SceneObjectPartSyncProperties.OffsetPosition); allProperties.Add(SceneObjectPartSyncProperties.OffsetPosition);
allProperties.Add(SceneObjectPartSyncProperties.Scale); //allProperties.Add(SceneObjectPartSyncProperties.Scale);
allProperties.Add(SceneObjectPartSyncProperties.GroupPosition); allProperties.Add(SceneObjectPartSyncProperties.GroupPosition);
allProperties.Add(SceneObjectPartSyncProperties.Orientation); allProperties.Add(SceneObjectPartSyncProperties.Orientation);
allProperties.Add(SceneObjectPartSyncProperties.RotationalVelocity); allProperties.Add(SceneObjectPartSyncProperties.RotationalVelocity);
allProperties.Add(SceneObjectPartSyncProperties.Position); allProperties.Add(SceneObjectPartSyncProperties.Position);
allProperties.Add(SceneObjectPartSyncProperties.AbsolutePosition); allProperties.Add(SceneObjectPartSyncProperties.AbsolutePosition);
allProperties.Add(SceneObjectPartSyncProperties.PA_Acceleration);
return allProperties; return allProperties;
} }

Binary file not shown.