diff options
author | Melanie Thielker | 2016-04-29 22:36:56 +0200 |
---|---|---|
committer | Melanie Thielker | 2016-04-29 22:36:56 +0200 |
commit | 59ed89769aa292196f99affe0a99a758e63a538a (patch) | |
tree | 2c09cf5c14e2dc51b0e95cdd95ffd29d01abcbe0 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Allow default permissions from the viewer to be applied to uploaded objects. (diff) | |
download | opensim-SC-59ed89769aa292196f99affe0a99a758e63a538a.zip opensim-SC-59ed89769aa292196f99affe0a99a758e63a538a.tar.gz opensim-SC-59ed89769aa292196f99affe0a99a758e63a538a.tar.bz2 opensim-SC-59ed89769aa292196f99affe0a99a758e63a538a.tar.xz |
Apply user specified default perms across the board, to items uploaded as well as items created and to rezzed prims in world.
This effectively removes the concept of "default permissions" from OpenSim
because all known modern viewers set the permissions flags on login.
Ancient abandoned viewers will now default to the SL defaults.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 058b6f6..e829b15 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2566,6 +2566,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
2566 | sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape); | 2566 | sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape); |
2567 | AddNewSceneObject(sceneObject, true); | 2567 | AddNewSceneObject(sceneObject, true); |
2568 | sceneObject.SetGroup(groupID, null); | 2568 | sceneObject.SetGroup(groupID, null); |
2569 | |||
2570 | if (AgentPreferencesService != null) // This will override the brave new full perm world! | ||
2571 | { | ||
2572 | AgentPrefs prefs = AgentPreferencesService.GetAgentPreferences(ownerID); | ||
2573 | // Only apply user selected prefs if the user set them | ||
2574 | if (prefs.PermNextOwner != 0) | ||
2575 | { | ||
2576 | sceneObject.RootPart.GroupMask = (uint)prefs.PermGroup; | ||
2577 | sceneObject.RootPart.EveryoneMask = (uint)prefs.PermEveryone; | ||
2578 | sceneObject.RootPart.NextOwnerMask = (uint)prefs.PermNextOwner; | ||
2579 | } | ||
2580 | } | ||
2569 | } | 2581 | } |
2570 | 2582 | ||
2571 | if (UserManagementModule != null) | 2583 | if (UserManagementModule != null) |