ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed handling of inventory a bit

Browse Source 
- AssetType isn't InventoryType. Those enums contain different numbers. Use AssetType for the asset type, InventoryType for the inventory type.
- The ToString method (or ToLower) of AssetType/InventoryType doesn't necessarily return the correct LLSD string.
- Replaced several magic numbers by their corresponding enum.
- Fixed the invType for gestures and animations in the library.
This should fix Mantis #3610 and the non-terminating inventory loading
This commit is contained in:
Homer Horwitz
2009-05-09 21:11:12 +00:00
parent c534d7f614
commit 1d234ca83f
7 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml
View File

@@ -6,7 +6,7 @@
<Key Name="name" Value="place_marker" />
<Key Name="description" Value="simple part-body standing, use low-priority to allow others - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="tpose2">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -15,7 +15,7 @@
<Key Name="name" Value="tpose2" />
<Key Name="description" Value="a tpose more suitable for posing stands - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="bouncy_ball_left">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -24,7 +24,7 @@
<Key Name="name" Value="bouncy_ball_left" />
<Key Name="description" Value="turn left on bouncy ball, grasping - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="tpose">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -33,7 +33,7 @@
<Key Name="name" Value="tpose" />
<Key Name="description" Value="the standard tpose (all must start with this in frame 1) - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="handshake">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -42,7 +42,7 @@
<Key Name="name" Value="handshake" />
<Key Name="description" Value="a simple right-handed, double-pump handshake, (30x30fps) - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="give_and_handshake">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -51,7 +51,7 @@
<Key Name="name" Value="give_and_handshake" />
<Key Name="description" Value="same as handshake, but gives something with left hand first (30x30fps) - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="bouncy_ball_walk">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -60,7 +60,7 @@
<Key Name="name" Value="bouncy_ball_walk" />
<Key Name="description" Value="move foward on bouncy ball, walk speed, grasping - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="bouncy_ball_run">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -69,7 +69,7 @@
<Key Name="name" Value="bouncy_ball_run" />
<Key Name="description" Value="move foward on bouncy ball, run speed, grasping - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="windsurf_left">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -78,7 +78,7 @@
<Key Name="name" Value="windsurf_left" />
<Key Name="description" Value="static, full body, pose of windsurfer, left foot forward - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="bouncy_ball_super">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -87,7 +87,7 @@
<Key Name="name" Value="bouncy_ball_super" />
<Key Name="description" Value="super bounce on bouncy ball, matrix-like, grasping - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="bouncy_ball_right">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -96,7 +96,7 @@
<Key Name="name" Value="bouncy_ball_right" />
<Key Name="description" Value="turn right on bouncy ball, grasping - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>
<Section Name="autograph_right">
<Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -105,7 +105,7 @@
<Key Name="name" Value="autograph_right" />
<Key Name="description" Value="part-body, right-handed signing autograph with left give - contributed by Mo Hax" />
<Key Name="assetType" Value="20" />
<Key Name="inventoryType" Value="20" />
<Key Name="inventoryType" Value="19" />
</Section>