diff options
author | Melanie Thielker | 2014-09-27 02:30:01 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-09-27 02:30:01 +0200 |
commit | 3ea76e3131203f6a553d5a540d5d28aa5ca3f74a (patch) | |
tree | d107b2e8fab320ab9bb9f1902884759b076de5b2 /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
parent | bug fix: add missing attach to region heartbeat event to update animations (diff) | |
download | opensim-SC_OLD-3ea76e3131203f6a553d5a540d5d28aa5ca3f74a.zip opensim-SC_OLD-3ea76e3131203f6a553d5a540d5d28aa5ca3f74a.tar.gz opensim-SC_OLD-3ea76e3131203f6a553d5a540d5d28aa5ca3f74a.tar.bz2 opensim-SC_OLD-3ea76e3131203f6a553d5a540d5d28aa5ca3f74a.tar.xz |
Make changes to AnimationSet to allow indexing by names rather than indices. Add some debugging output and prepare for parsing an ascii-based format.
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 e8ad0f2..94782f9 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -277,6 +277,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
277 | 277 | ||
278 | remoteClient.SendAlertMessage("Script saved"); | 278 | remoteClient.SendAlertMessage("Script saved"); |
279 | } | 279 | } |
280 | else if ((CustomInventoryType)item.InvType == CustomInventoryType.AnimationSet) | ||
281 | { | ||
282 | AnimationSet animSet = new AnimationSet(data); | ||
283 | if (!animSet.Validate(x => { | ||
284 | int perms = m_Scene.InventoryService.GetAssetPermissions(remoteClient.AgentId, x); | ||
285 | int required = (int)(PermissionMask.Transfer | PermissionMask.Copy); | ||
286 | if ((perms & required) != required) | ||
287 | return false; | ||
288 | return true; | ||
289 | })) | ||
290 | { | ||
291 | data = animSet.ToBytes(); | ||
292 | } | ||
293 | } | ||
280 | 294 | ||
281 | AssetBase asset = | 295 | AssetBase asset = |
282 | CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString()); | 296 | CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString()); |