diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-03 10:41:46 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-03 10:41:46 -0500 |
commit | 963e3346b1c81590d0c31097912e6481515f3722 (patch) | |
tree | f9cb9ea89baf41175ab4be753f189f7d024a6bd5 /indra/llinventory/llinventory.cpp | |
parent | 1ef5278bd6eb89fb4c68f92d86a165a0b314fd50 (diff) | |
parent | 36954908632d6f5366f6517023676c1bcd71aa17 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llinventory/llinventory.cpp')
-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"); |