diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-28 14:08:38 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-28 14:08:38 -0400 |
| commit | b7bfc3ae7a7934676b217e0c1fe24ce821ab4649 (patch) | |
| tree | 4bfac8f82f69738d15d71693c8938f62e2c59f66 /indra/newview/llwearabletype.cpp | |
| parent | 0b96ae29cf0b2baf4732e09a28a5f76d3df05727 (diff) | |
| parent | 7983de22074beb25a832f89aa3e7a9728baca328 (diff) | |
automated merge
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 |