diff options
| author | Oren Hurvitz | 2013-11-04 19:28:24 +0200 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-01-10 19:37:59 +0000 |
| commit | 13f31fdf85c404896c166932730b7b8bc5416626 (patch) | |
| tree | 7fc489557e3b3c040b02c185c5ea97bcdf85434d /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | If an agent is sitting, then do send the rotation in the agent update instead... (diff) | |
| download | opensim-SC_OLD-13f31fdf85c404896c166932730b7b8bc5416626.zip opensim-SC_OLD-13f31fdf85c404896c166932730b7b8bc5416626.tar.gz opensim-SC_OLD-13f31fdf85c404896c166932730b7b8bc5416626.tar.bz2 opensim-SC_OLD-13f31fdf85c404896c166932730b7b8bc5416626.tar.xz | |
Refactored setting permissions when rezzing items: use the same function when rezzing from user inventory and prim inventory.
Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
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 4b4e4ba..23507f4 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> |