diff options
| author | Melanie | 2012-12-21 22:13:41 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-21 22:13:41 +0000 |
| commit | 569f39e1242044a46693926c31d86fff6b4b228c (patch) | |
| tree | 69fb5c2b0ce512336680b48bbf89bb42bb8f5b88 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: small fix to avatar movement motor use which keeps avatar from fly... (diff) | |
| download | opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.zip opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.tar.gz opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.tar.bz2 opensim-SC-569f39e1242044a46693926c31d86fff6b4b228c.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 2051a53..1fc8d3d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -101,6 +101,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 101 | /// </summary> | 101 | /// </summary> |
| 102 | public partial class SceneObjectGroup : EntityBase, ISceneObject | 102 | public partial class SceneObjectGroup : EntityBase, ISceneObject |
| 103 | { | 103 | { |
| 104 | // Axis selection bitmask used by SetAxisRotation() | ||
| 105 | // Just happen to be the same bits used by llSetStatus() and defined in ScriptBaseClass. | ||
| 106 | public enum axisSelect : int | ||
| 107 | { | ||
| 108 | STATUS_ROTATE_X = 0x002, | ||
| 109 | STATUS_ROTATE_Y = 0x004, | ||
| 110 | STATUS_ROTATE_Z = 0x008, | ||
| 111 | } | ||
| 112 | |||
| 104 | // private PrimCountTaintedDelegate handlerPrimCountTainted = null; | 113 | // private PrimCountTaintedDelegate handlerPrimCountTainted = null; |
| 105 | 114 | ||
| 106 | /// <summary> | 115 | /// <summary> |