diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-28 11:39:28 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-28 11:39:28 -0400 |
| commit | 7983de22074beb25a832f89aa3e7a9728baca328 (patch) | |
| tree | 4812d1e655e8c4c3c48c00dbefa79b62cafe20ce /indra/newview/llwearabletype.cpp | |
| parent | 955698c7a6d04c1ed895bfc2b9b5acf4e8d5473e (diff) | |
| parent | e07deaa3dac6b9bc651034543c174e974b4b9ad2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/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 |