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

Merge branch 'ubitworkmaster'

avinationmerge
Melanie Thielker 2014-10-04 05:10:46 +02:00
parent 307e49b3a7 4ae960a4f0
commit 8918c42540
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1023,6 +1023,10 @@ namespace OpenSim.Region.Framework.Scenes
item.BasePermissions = baseMask; item.BasePermissions = baseMask;
item.CreationDate = creationDate; item.CreationDate = creationDate;
// special AnimationSet case
if (item.InvType == (int)CustomInventoryType.AnimationSet)
AnimationSet.enforceItemPermitions(item,true);
if (AddInventoryItem(item)) if (AddInventoryItem(item))
{ {
remoteClient.SendInventoryItemCreateUpdate(item, transationID, callbackID); remoteClient.SendInventoryItemCreateUpdate(item, transationID, callbackID);
@ -1063,10 +1067,6 @@ namespace OpenSim.Region.Framework.Scenes
if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
return; return;
if (type != (sbyte)AssetType.Link || type != (sbyte)AssetType.LinkFolder)
return;
ScenePresence presence; ScenePresence presence;
if (TryGetScenePresence(remoteClient.AgentId, out presence)) if (TryGetScenePresence(remoteClient.AgentId, out presence))
{ {