OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix new landmarks default permissions

httptests
UbitUmarov 2017-04-30 12:43:09 +01:00
parent 116d32d947
commit 514249e80e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -212,6 +212,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
if (m_Scene.TryGetScenePresence(remoteClient.AgentId, out presence)) if (m_Scene.TryGetScenePresence(remoteClient.AgentId, out presence))
{ {
byte[] data = null; byte[] data = null;
uint everyonemask = 0;
uint groupmask = 0;
if (invType == (sbyte)InventoryType.Landmark && presence != null) if (invType == (sbyte)InventoryType.Landmark && presence != null)
{ {
@ -220,6 +222,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
data = Encoding.ASCII.GetBytes(strdata); data = Encoding.ASCII.GetBytes(strdata);
name = prefix + name; name = prefix + name;
description += suffix; description += suffix;
groupmask = (uint)PermissionMask.AllAndExport;
everyonemask = (uint)(PermissionMask.AllAndExport & ~PermissionMask.Modify);
} }
AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId); AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId);
@ -227,9 +231,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
m_Scene.CreateNewInventoryItem( m_Scene.CreateNewInventoryItem(
remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
name, description, 0, callbackID, asset.FullID, asset.Type, invType, name, description, 0, callbackID, asset.FullID, asset.Type, invType,
(uint)PermissionMask.All | (uint)PermissionMask.Export, // Base (uint)PermissionMask.AllAndExport, // Base
(uint)PermissionMask.All | (uint)PermissionMask.Export, // Current (uint)PermissionMask.AllAndExport, // Current
0, nextOwnerMask, 0, creationDate, false); // Data from viewer everyonemask,
nextOwnerMask, groupmask, creationDate, false); // Data from viewer
} }
else else
{ {