diff options
author | Jacek Antonelli | 2008-12-08 01:16:25 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-08 01:16:25 -0600 |
commit | e68b9cd2f896ee5412b2dd6fe4bfe1aa55ed48e4 (patch) | |
tree | 216e2210ef27c45bcd6cb61c83b87a6d2e0f7be9 /linden/indra/llinventory/llinventory.h | |
parent | Moved enum EWearableType to its own file. (diff) | |
download | meta-impy-e68b9cd2f896ee5412b2dd6fe4bfe1aa55ed48e4.zip meta-impy-e68b9cd2f896ee5412b2dd6fe4bfe1aa55ed48e4.tar.gz meta-impy-e68b9cd2f896ee5412b2dd6fe4bfe1aa55ed48e4.tar.bz2 meta-impy-e68b9cd2f896ee5412b2dd6fe4bfe1aa55ed48e4.tar.xz |
Added calc_ntype() function.
Diffstat (limited to 'linden/indra/llinventory/llinventory.h')
-rw-r--r-- | linden/indra/llinventory/llinventory.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h index ac4e470..247e646 100644 --- a/linden/indra/llinventory/llinventory.h +++ b/linden/indra/llinventory/llinventory.h | |||
@@ -42,6 +42,7 @@ | |||
42 | #include "llsaleinfo.h" | 42 | #include "llsaleinfo.h" |
43 | #include "llsd.h" | 43 | #include "llsd.h" |
44 | #include "lluuid.h" | 44 | #include "lluuid.h" |
45 | #include "llwearabletype.h" | ||
45 | #include "llxmlnode.h" | 46 | #include "llxmlnode.h" |
46 | 47 | ||
47 | // consts for Key field in the task inventory update message | 48 | // consts for Key field in the task inventory update message |
@@ -56,6 +57,10 @@ enum | |||
56 | }; | 57 | }; |
57 | 58 | ||
58 | 59 | ||
60 | LLInventoryType::NType calc_ntype( LLInventoryType::EType inv_type, | ||
61 | LLAssetType::EType asset_type, | ||
62 | U32 flags ); | ||
63 | |||
59 | 64 | ||
60 | //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 65 | //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
61 | // Class LLInventoryObject | 66 | // Class LLInventoryObject |