diff options
Diffstat (limited to 'indra/llinventory')
30 files changed, 54 insertions, 54 deletions
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt index a563db901a..a563db901a 100755..100644 --- a/indra/llinventory/CMakeLists.txt +++ b/indra/llinventory/CMakeLists.txt diff --git a/indra/llinventory/llcategory.cpp b/indra/llinventory/llcategory.cpp index 02c5a8ee28..02c5a8ee28 100755..100644 --- a/indra/llinventory/llcategory.cpp +++ b/indra/llinventory/llcategory.cpp diff --git a/indra/llinventory/llcategory.h b/indra/llinventory/llcategory.h index c8e2dac30d..c8e2dac30d 100755..100644 --- a/indra/llinventory/llcategory.h +++ b/indra/llinventory/llcategory.h diff --git a/indra/llinventory/lleconomy.cpp b/indra/llinventory/lleconomy.cpp index 4366d1eb2a..4366d1eb2a 100755..100644 --- a/indra/llinventory/lleconomy.cpp +++ b/indra/llinventory/lleconomy.cpp diff --git a/indra/llinventory/lleconomy.h b/indra/llinventory/lleconomy.h index e480085453..e480085453 100755..100644 --- a/indra/llinventory/lleconomy.h +++ b/indra/llinventory/lleconomy.h diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 53830b1a14..53830b1a14 100755..100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 4c6ac83ab8..4c6ac83ab8 100755..100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h diff --git a/indra/llinventory/llinventorydefines.cpp b/indra/llinventory/llinventorydefines.cpp index a9610d4d4b..a9610d4d4b 100755..100644 --- a/indra/llinventory/llinventorydefines.cpp +++ b/indra/llinventory/llinventorydefines.cpp diff --git a/indra/llinventory/llinventorydefines.h b/indra/llinventory/llinventorydefines.h index 67e629c546..67e629c546 100755..100644 --- a/indra/llinventory/llinventorydefines.h +++ b/indra/llinventory/llinventorydefines.h diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp index 5c5500b6f4..3ab88de390 100755..100644 --- a/indra/llinventory/llinventorytype.cpp +++ b/indra/llinventory/llinventorytype.cpp @@ -98,58 +98,58 @@ LLInventoryDictionary::LLInventoryDictionary() static const LLInventoryType::EType DEFAULT_ASSET_FOR_INV_TYPE[LLAssetType::AT_COUNT] = { - LLInventoryType::IT_TEXTURE, // AT_TEXTURE - LLInventoryType::IT_SOUND, // AT_SOUND - LLInventoryType::IT_CALLINGCARD, // AT_CALLINGCARD - LLInventoryType::IT_LANDMARK, // AT_LANDMARK - LLInventoryType::IT_LSL, // AT_SCRIPT - LLInventoryType::IT_WEARABLE, // AT_CLOTHING - LLInventoryType::IT_OBJECT, // AT_OBJECT - LLInventoryType::IT_NOTECARD, // AT_NOTECARD - LLInventoryType::IT_CATEGORY, // AT_CATEGORY - LLInventoryType::IT_NONE, // (null entry) - LLInventoryType::IT_LSL, // AT_LSL_TEXT - LLInventoryType::IT_LSL, // AT_LSL_BYTECODE - LLInventoryType::IT_TEXTURE, // AT_TEXTURE_TGA - LLInventoryType::IT_WEARABLE, // AT_BODYPART - LLInventoryType::IT_CATEGORY, // AT_TRASH - LLInventoryType::IT_CATEGORY, // AT_SNAPSHOT_CATEGORY - LLInventoryType::IT_CATEGORY, // AT_LOST_AND_FOUND - LLInventoryType::IT_SOUND, // AT_SOUND_WAV - LLInventoryType::IT_NONE, // AT_IMAGE_TGA - LLInventoryType::IT_NONE, // AT_IMAGE_JPEG - LLInventoryType::IT_ANIMATION, // AT_ANIMATION - LLInventoryType::IT_GESTURE, // AT_GESTURE - LLInventoryType::IT_NONE, // AT_SIMSTATE - - LLInventoryType::IT_NONE, // AT_LINK - LLInventoryType::IT_NONE, // AT_LINK_FOLDER - - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_NONE, // AT_NONE - LLInventoryType::IT_MESH // AT_MESH + LLInventoryType::IT_TEXTURE, // 0 AT_TEXTURE + LLInventoryType::IT_SOUND, // 1 AT_SOUND + LLInventoryType::IT_CALLINGCARD, // 2 AT_CALLINGCARD + LLInventoryType::IT_LANDMARK, // 3 AT_LANDMARK + LLInventoryType::IT_LSL, // 4 AT_SCRIPT + LLInventoryType::IT_WEARABLE, // 5 AT_CLOTHING + LLInventoryType::IT_OBJECT, // 6 AT_OBJECT + LLInventoryType::IT_NOTECARD, // 7 AT_NOTECARD + LLInventoryType::IT_CATEGORY, // 8 AT_CATEGORY + LLInventoryType::IT_NONE, // 9 (null entry) + LLInventoryType::IT_LSL, // 10 AT_LSL_TEXT + LLInventoryType::IT_LSL, // 11 AT_LSL_BYTECODE + LLInventoryType::IT_TEXTURE, // 12 AT_TEXTURE_TGA + LLInventoryType::IT_WEARABLE, // 13 AT_BODYPART + LLInventoryType::IT_CATEGORY, // 14 AT_TRASH + LLInventoryType::IT_CATEGORY, // 15 AT_SNAPSHOT_CATEGORY + LLInventoryType::IT_CATEGORY, // 16 AT_LOST_AND_FOUND + LLInventoryType::IT_SOUND, // 17 AT_SOUND_WAV + LLInventoryType::IT_NONE, // 18 AT_IMAGE_TGA + LLInventoryType::IT_NONE, // 19 AT_IMAGE_JPEG + LLInventoryType::IT_ANIMATION, // 20 AT_ANIMATION + LLInventoryType::IT_GESTURE, // 21 AT_GESTURE + LLInventoryType::IT_NONE, // 22 AT_SIMSTATE + + LLInventoryType::IT_NONE, // 23 AT_LINK + LLInventoryType::IT_NONE, // 24 AT_LINK_FOLDER + + LLInventoryType::IT_NONE, // 25 AT_NONE + LLInventoryType::IT_NONE, // 26 AT_NONE + LLInventoryType::IT_NONE, // 27 AT_NONE + LLInventoryType::IT_NONE, // 28 AT_NONE + LLInventoryType::IT_NONE, // 29 AT_NONE + LLInventoryType::IT_NONE, // 30 AT_NONE + LLInventoryType::IT_NONE, // 31 AT_NONE + LLInventoryType::IT_NONE, // 32 AT_NONE + LLInventoryType::IT_NONE, // 33 AT_NONE + LLInventoryType::IT_NONE, // 34 AT_NONE + LLInventoryType::IT_NONE, // 35 AT_NONE + LLInventoryType::IT_NONE, // 36 AT_NONE + LLInventoryType::IT_NONE, // 37 AT_NONE + LLInventoryType::IT_NONE, // 38 AT_NONE + LLInventoryType::IT_NONE, // 39 AT_NONE + LLInventoryType::IT_NONE, // 40 AT_NONE + LLInventoryType::IT_NONE, // 41 AT_NONE + LLInventoryType::IT_NONE, // 42 AT_NONE + LLInventoryType::IT_NONE, // 43 AT_NONE + LLInventoryType::IT_NONE, // 44 AT_NONE + LLInventoryType::IT_NONE, // 45 AT_NONE + LLInventoryType::IT_NONE, // 46 AT_NONE + LLInventoryType::IT_NONE, // 47 AT_NONE + LLInventoryType::IT_NONE, // 48 AT_NONE + LLInventoryType::IT_MESH // 49 AT_MESH }; // static diff --git a/indra/llinventory/llinventorytype.h b/indra/llinventory/llinventorytype.h index 17ed3df951..17ed3df951 100755..100644 --- a/indra/llinventory/llinventorytype.h +++ b/indra/llinventory/llinventorytype.h diff --git a/indra/llinventory/lllandmark.cpp b/indra/llinventory/lllandmark.cpp index 83b6392ca8..83b6392ca8 100755..100644 --- a/indra/llinventory/lllandmark.cpp +++ b/indra/llinventory/lllandmark.cpp diff --git a/indra/llinventory/lllandmark.h b/indra/llinventory/lllandmark.h index feaf1a0e9c..feaf1a0e9c 100755..100644 --- a/indra/llinventory/lllandmark.h +++ b/indra/llinventory/lllandmark.h diff --git a/indra/llinventory/llnotecard.cpp b/indra/llinventory/llnotecard.cpp index f6e41eecb4..f6e41eecb4 100755..100644 --- a/indra/llinventory/llnotecard.cpp +++ b/indra/llinventory/llnotecard.cpp diff --git a/indra/llinventory/llnotecard.h b/indra/llinventory/llnotecard.h index 092ab2ce35..092ab2ce35 100755..100644 --- a/indra/llinventory/llnotecard.h +++ b/indra/llinventory/llnotecard.h diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 488bd45d8f..488bd45d8f 100755..100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index 4ee9d9b40f..4ee9d9b40f 100755..100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h diff --git a/indra/llinventory/llparcelflags.h b/indra/llinventory/llparcelflags.h index a1bd85f50b..a1bd85f50b 100755..100644 --- a/indra/llinventory/llparcelflags.h +++ b/indra/llinventory/llparcelflags.h diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp index 9683252dc4..9683252dc4 100755..100644 --- a/indra/llinventory/llpermissions.cpp +++ b/indra/llinventory/llpermissions.cpp diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h index fa20d5c214..fa20d5c214 100755..100644 --- a/indra/llinventory/llpermissions.h +++ b/indra/llinventory/llpermissions.h diff --git a/indra/llinventory/llpermissionsflags.h b/indra/llinventory/llpermissionsflags.h index f810929d68..f810929d68 100755..100644 --- a/indra/llinventory/llpermissionsflags.h +++ b/indra/llinventory/llpermissionsflags.h diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp index 930901f309..930901f309 100755..100644 --- a/indra/llinventory/llsaleinfo.cpp +++ b/indra/llinventory/llsaleinfo.cpp diff --git a/indra/llinventory/llsaleinfo.h b/indra/llinventory/llsaleinfo.h index 3461a128be..3461a128be 100755..100644 --- a/indra/llinventory/llsaleinfo.h +++ b/indra/llinventory/llsaleinfo.h diff --git a/indra/llinventory/lltransactionflags.cpp b/indra/llinventory/lltransactionflags.cpp index e0f87aa7db..e0f87aa7db 100755..100644 --- a/indra/llinventory/lltransactionflags.cpp +++ b/indra/llinventory/lltransactionflags.cpp diff --git a/indra/llinventory/lltransactionflags.h b/indra/llinventory/lltransactionflags.h index 75f1d1263d..75f1d1263d 100755..100644 --- a/indra/llinventory/lltransactionflags.h +++ b/indra/llinventory/lltransactionflags.h diff --git a/indra/llinventory/lltransactiontypes.h b/indra/llinventory/lltransactiontypes.h index 2c699bcb87..2c699bcb87 100755..100644 --- a/indra/llinventory/lltransactiontypes.h +++ b/indra/llinventory/lltransactiontypes.h diff --git a/indra/llinventory/lluserrelations.cpp b/indra/llinventory/lluserrelations.cpp index 8d6bfc6139..8d6bfc6139 100755..100644 --- a/indra/llinventory/lluserrelations.cpp +++ b/indra/llinventory/lluserrelations.cpp diff --git a/indra/llinventory/lluserrelations.h b/indra/llinventory/lluserrelations.h index 1682f506ea..1682f506ea 100755..100644 --- a/indra/llinventory/lluserrelations.h +++ b/indra/llinventory/lluserrelations.h diff --git a/indra/llinventory/tests/inventorymisc_test.cpp b/indra/llinventory/tests/inventorymisc_test.cpp index c797a70c50..7fdd8ce072 100755..100644 --- a/indra/llinventory/tests/inventorymisc_test.cpp +++ b/indra/llinventory/tests/inventorymisc_test.cpp @@ -106,7 +106,7 @@ namespace tut }; typedef test_group<inventory_data> inventory_test; typedef inventory_test::object inventory_object; - tut::inventory_test inv("llinventory"); + tut::inventory_test inv("LLInventory"); //***class LLInventoryType***// diff --git a/indra/llinventory/tests/llparcel_test.cpp b/indra/llinventory/tests/llparcel_test.cpp index cb762eec3c..eef2536ca5 100755..100644 --- a/indra/llinventory/tests/llparcel_test.cpp +++ b/indra/llinventory/tests/llparcel_test.cpp @@ -46,7 +46,7 @@ namespace tut }; typedef test_group<llinventoryparcel_data> llinventoryparcel_test; typedef llinventoryparcel_test::object llinventoryparcel_object; - tut::llinventoryparcel_test llinventoryparcel("llinventoryparcel"); + tut::llinventoryparcel_test llinventoryparcel("LLInventoryParcel"); template<> template<> void llinventoryparcel_object::test<1>() |