diff options
author | UbitUmarov | 2014-10-04 03:43:20 +0100 |
---|---|---|
committer | UbitUmarov | 2014-10-04 03:43:20 +0100 |
commit | 4ae960a4f0b939ec1ce50414b771a0774bf991f8 (patch) | |
tree | dae184ae1834f4d71476ffddf4b74e9b39349e0f /OpenSim/Region/Framework/Scenes | |
parent | added a missing angularVelocity.Zero on sitting, removed odd camera based (diff) | |
download | opensim-SC-4ae960a4f0b939ec1ce50414b771a0774bf991f8.zip opensim-SC-4ae960a4f0b939ec1ce50414b771a0774bf991f8.tar.gz opensim-SC-4ae960a4f0b939ec1ce50414b771a0774bf991f8.tar.bz2 opensim-SC-4ae960a4f0b939ec1ce50414b771a0774bf991f8.tar.xz |
bug fix: revert back check on creating link
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 5197f58..0c51f7f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1023,6 +1023,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1023 | item.BasePermissions = baseMask; | 1023 | item.BasePermissions = baseMask; |
1024 | item.CreationDate = creationDate; | 1024 | item.CreationDate = creationDate; |
1025 | 1025 | ||
1026 | // special AnimationSet case | ||
1027 | if (item.InvType == (int)CustomInventoryType.AnimationSet) | ||
1028 | AnimationSet.enforceItemPermitions(item,true); | ||
1029 | |||
1026 | if (AddInventoryItem(item)) | 1030 | if (AddInventoryItem(item)) |
1027 | { | 1031 | { |
1028 | remoteClient.SendInventoryItemCreateUpdate(item, transationID, callbackID); | 1032 | remoteClient.SendInventoryItemCreateUpdate(item, transationID, callbackID); |
@@ -1063,10 +1067,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1063 | if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) | 1067 | if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) |
1064 | return; | 1068 | return; |
1065 | 1069 | ||
1066 | if (type != (sbyte)AssetType.Link || type != (sbyte)AssetType.LinkFolder) | ||
1067 | return; | ||
1068 | |||
1069 | |||
1070 | ScenePresence presence; | 1070 | ScenePresence presence; |
1071 | if (TryGetScenePresence(remoteClient.AgentId, out presence)) | 1071 | if (TryGetScenePresence(remoteClient.AgentId, out presence)) |
1072 | { | 1072 | { |