diff options
author | UbitUmarov | 2014-09-29 20:36:03 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-29 20:36:03 +0100 |
commit | cfb1a2730045420319f0678ccc70e61d6a46df82 (patch) | |
tree | ae0e0c7684a4d9da05b0ac04f4892bffcfb7209d /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
parent | change avatar physics and motion control. Still not that good :( (diff) | |
parent | Also fetch and store old asset for animation sets (diff) | |
download | opensim-SC_OLD-cfb1a2730045420319f0678ccc70e61d6a46df82.zip opensim-SC_OLD-cfb1a2730045420319f0678ccc70e61d6a46df82.tar.gz opensim-SC_OLD-cfb1a2730045420319f0678ccc70e61d6a46df82.tar.bz2 opensim-SC_OLD-cfb1a2730045420319f0678ccc70e61d6a46df82.tar.xz |
Merge branch 'master' into ubitworkmaster
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index b3dc0c0..64a9610 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -278,6 +278,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
278 | 278 | ||
279 | remoteClient.SendAlertMessage("Script saved"); | 279 | remoteClient.SendAlertMessage("Script saved"); |
280 | } | 280 | } |
281 | else if ((CustomInventoryType)item.InvType == CustomInventoryType.AnimationSet) | ||
282 | { | ||
283 | AnimationSet animSet = new AnimationSet(data); | ||
284 | if (!animSet.Validate(x => { | ||
285 | int perms = m_Scene.InventoryService.GetAssetPermissions(remoteClient.AgentId, x); | ||
286 | int required = (int)(PermissionMask.Transfer | PermissionMask.Copy); | ||
287 | if ((perms & required) != required) | ||
288 | return false; | ||
289 | return true; | ||
290 | })) | ||
291 | { | ||
292 | data = animSet.ToBytes(); | ||
293 | } | ||
294 | } | ||
281 | 295 | ||
282 | AssetBase asset = | 296 | AssetBase asset = |
283 | CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString()); | 297 | CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString()); |