diff options
| author | Justin Clark-Casey (justincc) | 2014-01-10 20:19:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-01-10 20:19:38 +0000 |
| commit | 5e72de19088a753b0607454d59039d5b54f64695 (patch) | |
| tree | 59dab06d7a41aff10ba595f814caa9b1823564c6 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'justincc-master' (diff) | |
| parent | When creating a coalesced object, set its permissions to the lowest-common-de... (diff) | |
| download | opensim-SC-5e72de19088a753b0607454d59039d5b54f64695.zip opensim-SC-5e72de19088a753b0607454d59039d5b54f64695.tar.gz opensim-SC-5e72de19088a753b0607454d59039d5b54f64695.tar.bz2 opensim-SC-5e72de19088a753b0607454d59039d5b54f64695.tar.xz | |
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index a2e4417..9548200 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -109,6 +109,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 109 | STATUS_ROTATE_Z = 0x008, | 109 | STATUS_ROTATE_Z = 0x008, |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | // This flag has the same purpose as InventoryItemFlags.ObjectSlamPerm | ||
| 113 | public static readonly uint SLAM = 16; | ||
| 114 | |||
| 112 | // private PrimCountTaintedDelegate handlerPrimCountTainted = null; | 115 | // private PrimCountTaintedDelegate handlerPrimCountTainted = null; |
| 113 | 116 | ||
| 114 | /// <summary> | 117 | /// <summary> |