diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
commit | 36954908632d6f5366f6517023676c1bcd71aa17 (patch) | |
tree | 3c46d7c43e474ba71596ebec5730cf0f0ed72a1a /indra/llinventory | |
parent | c6302cfbc750171ef536426d40e966e43e3aedc9 (diff) | |
parent | 375d91019eefa0f2bc4f4685fb0f34dac987b189 (diff) |
merge fixes for STORM-432
Diffstat (limited to 'indra/llinventory')
-rw-r--r-- | indra/llinventory/llinventory.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index bda76eac80..a3caf79519 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -61,8 +61,6 @@ static const std::string INV_FOLDER_ID_LABEL_WS("category_id"); ///---------------------------------------------------------------------------- /// Local function declarations, constants, enums, and typedefs ///---------------------------------------------------------------------------- -const U8 TASK_INVENTORY_ITEM_KEY = 0; -const U8 TASK_INVENTORY_ASSET_KEY = 1; const LLUUID MAGIC_ID("3c115e51-04f4-523c-9fa6-98aff1034730"); |