diff options
author | UbitUmarov | 2017-04-30 12:43:09 +0100 |
---|---|---|
committer | UbitUmarov | 2017-04-30 12:43:09 +0100 |
commit | 514249e80ec527c79157bce80f39b8adb1b344c1 (patch) | |
tree | c5bda9c885a247df7e417285d179678811f69090 /OpenSim/Region/CoreModules | |
parent | don't break groups permission mask (diff) | |
download | opensim-SC_OLD-514249e80ec527c79157bce80f39b8adb1b344c1.zip opensim-SC_OLD-514249e80ec527c79157bce80f39b8adb1b344c1.tar.gz opensim-SC_OLD-514249e80ec527c79157bce80f39b8adb1b344c1.tar.bz2 opensim-SC_OLD-514249e80ec527c79157bce80f39b8adb1b344c1.tar.xz |
fix new landmarks default permissions
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index a32d7dc..916ddb0 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -212,6 +212,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
212 | if (m_Scene.TryGetScenePresence(remoteClient.AgentId, out presence)) | 212 | if (m_Scene.TryGetScenePresence(remoteClient.AgentId, out presence)) |
213 | { | 213 | { |
214 | byte[] data = null; | 214 | byte[] data = null; |
215 | uint everyonemask = 0; | ||
216 | uint groupmask = 0; | ||
215 | 217 | ||
216 | if (invType == (sbyte)InventoryType.Landmark && presence != null) | 218 | if (invType == (sbyte)InventoryType.Landmark && presence != null) |
217 | { | 219 | { |
@@ -220,6 +222,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
220 | data = Encoding.ASCII.GetBytes(strdata); | 222 | data = Encoding.ASCII.GetBytes(strdata); |
221 | name = prefix + name; | 223 | name = prefix + name; |
222 | description += suffix; | 224 | description += suffix; |
225 | groupmask = (uint)PermissionMask.AllAndExport; | ||
226 | everyonemask = (uint)(PermissionMask.AllAndExport & ~PermissionMask.Modify); | ||
223 | } | 227 | } |
224 | 228 | ||
225 | AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId); | 229 | AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId); |
@@ -227,9 +231,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
227 | m_Scene.CreateNewInventoryItem( | 231 | m_Scene.CreateNewInventoryItem( |
228 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, | 232 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, |
229 | name, description, 0, callbackID, asset.FullID, asset.Type, invType, | 233 | name, description, 0, callbackID, asset.FullID, asset.Type, invType, |
230 | (uint)PermissionMask.All | (uint)PermissionMask.Export, // Base | 234 | (uint)PermissionMask.AllAndExport, // Base |
231 | (uint)PermissionMask.All | (uint)PermissionMask.Export, // Current | 235 | (uint)PermissionMask.AllAndExport, // Current |
232 | 0, nextOwnerMask, 0, creationDate, false); // Data from viewer | 236 | everyonemask, |
237 | nextOwnerMask, groupmask, creationDate, false); // Data from viewer | ||
233 | } | 238 | } |
234 | else | 239 | else |
235 | { | 240 | { |