diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 20:35:02 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 20:35:02 +0100 |
| commit | 15039662f2aeef72a799d8a9a474ebe4141dd7cc (patch) | |
| tree | aa5be61cae72542b0742f243bd7097570e9ab3fc /indra/newview/llwearabletype.cpp | |
| parent | 3e1100dbfa8549e8738bc68b5a4a2e5d36a0da85 (diff) | |
| parent | a5c9e30fc806cc8cf291b7da0fd4133ca8241fed (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llwearabletype.cpp')
| -rw-r--r-- | indra/newview/llwearabletype.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwearabletype.cpp b/indra/newview/llwearabletype.cpp index c692df06ad..2a14ace38c 100644 --- a/indra/newview/llwearabletype.cpp +++ b/indra/newview/llwearabletype.cpp @@ -85,7 +85,7 @@ LLWearableDictionary::LLWearableDictionary() addEntry(LLWearableType::WT_TATTOO, new WearableEntry("tattoo", "New Tattoo", LLAssetType::AT_CLOTHING, LLInventoryIcon::ICONNAME_CLOTHING_TATTOO)); addEntry(LLWearableType::WT_INVALID, new WearableEntry("invalid", "Invalid Wearable", LLAssetType::AT_NONE, LLInventoryIcon::ICONNAME_NONE)); addEntry(LLWearableType::WT_NONE, new WearableEntry("none", "Invalid Wearable", LLAssetType::AT_NONE, LLInventoryIcon::ICONNAME_NONE)); - addEntry(LLWearableType::WT_COUNT, NULL); + addEntry(LLWearableType::WT_COUNT, new WearableEntry("count", "Invalid Wearable", LLAssetType::AT_NONE, LLInventoryIcon::ICONNAME_NONE)); } // static |