diff options
| author | Melanie Thielker | 2014-10-03 18:27:27 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-10-03 18:27:27 +0200 |
| commit | 93fa3777d2de7d5d17039ee18014c9d73e13cbc5 (patch) | |
| tree | a54caa4ae0003025024918088c1c88094c219663 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Also store names of assets in the AnimationSet (diff) | |
| parent | clean up coments, use a even faster XY move request detection (diff) | |
| download | opensim-SC-93fa3777d2de7d5d17039ee18014c9d73e13cbc5.zip opensim-SC-93fa3777d2de7d5d17039ee18014c9d73e13cbc5.tar.gz opensim-SC-93fa3777d2de7d5d17039ee18014c9d73e13cbc5.tar.bz2 opensim-SC-93fa3777d2de7d5d17039ee18014c9d73e13cbc5.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index e003a59..5197f58 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1063,6 +1063,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1063 | if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) | 1063 | if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) |
| 1064 | return; | 1064 | return; |
| 1065 | 1065 | ||
| 1066 | if (type != (sbyte)AssetType.Link || type != (sbyte)AssetType.LinkFolder) | ||
| 1067 | return; | ||
| 1068 | |||
| 1069 | |||
| 1066 | ScenePresence presence; | 1070 | ScenePresence presence; |
| 1067 | if (TryGetScenePresence(remoteClient.AgentId, out presence)) | 1071 | if (TryGetScenePresence(remoteClient.AgentId, out presence)) |
| 1068 | { | 1072 | { |