diff options
author | Teravus Ovares | 2008-02-10 10:55:57 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-02-10 10:55:57 +0000 |
commit | 85a9834ed84f33d3610499914fa3168a8eebce6d (patch) | |
tree | 23b51c0c9e944a64a54428d6f684210e784f42a3 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | Clean up logging calls using String.Format explicitly (diff) | |
download | opensim-SC-85a9834ed84f33d3610499914fa3168a8eebce6d.zip opensim-SC-85a9834ed84f33d3610499914fa3168a8eebce6d.tar.gz opensim-SC-85a9834ed84f33d3610499914fa3168a8eebce6d.tar.bz2 opensim-SC-85a9834ed84f33d3610499914fa3168a8eebce6d.tar.xz |
* A lot of ugly permissions updates.
** Created SendFullUpdateToAllClientsExcept(LLUUID) so that permission updates /appear/ to apply immediately
** Separated out the ObjectFlags and the Permission Flags. They're related but not the same
** Added a hack routine to add *back* the objectflags to the client flags because the client hates the way we're doing object permissions
** Updated the clientflags routine to properly tell the client when they can't edit admin objects (objects owned by the sim administrator) even when they're an estate manager(why? >.< argh!)
** Fixed a null sim administrator/estate manager/user from causing permissions to return false even when it should return true.
** Re-added ObjectModify hack to allow collaboration with the allow anyone to move checkbox until we get group permissions done.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index c204389..a14d869 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -60,6 +60,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
60 | /// since the group's last persistent backup | 60 | /// since the group's last persistent backup |
61 | /// </summary> | 61 | /// </summary> |
62 | public bool HasGroupChanged = false; | 62 | public bool HasGroupChanged = false; |
63 | private bool m_locked = false; | ||
63 | 64 | ||
64 | private LLVector3 lastPhysGroupPos; | 65 | private LLVector3 lastPhysGroupPos; |
65 | private LLQuaternion lastPhysGroupRot; | 66 | private LLQuaternion lastPhysGroupRot; |
@@ -1217,7 +1218,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
1217 | part.UpdateExtraParam(type, inUse, data); | 1218 | part.UpdateExtraParam(type, inUse, data); |
1218 | } | 1219 | } |
1219 | } | 1220 | } |
1221 | public bool GetLocked() | ||
1222 | { | ||
1223 | return m_locked; | ||
1224 | } | ||
1225 | public void SetLocked(bool val) | ||
1226 | { | ||
1227 | m_locked = val; | ||
1220 | 1228 | ||
1229 | } | ||
1221 | /// <summary> | 1230 | /// <summary> |
1222 | /// | 1231 | /// |
1223 | /// </summary> | 1232 | /// </summary> |