diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-04-11 16:13:22 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-04-11 16:13:22 -0400 |
commit | e955cb58dffa16d789d05a9a7128fc8b44c94a34 (patch) | |
tree | 623b662bcfd05434562d7dec417d20a0e93e7e48 /indra/newview | |
parent | 4895b24e3861021c26a9df3ba9ba04400c63f5c8 (diff) |
SH-1328 FIXED Crash on LLWearableType::getAllowMultiwear
Crash was because we weren't checking for null wearable lookups.
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llwearabletype.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llwearabletype.cpp b/indra/newview/llwearabletype.cpp index f933be4d8f..9e95604712 100644 --- a/indra/newview/llwearabletype.cpp +++ b/indra/newview/llwearabletype.cpp @@ -144,6 +144,7 @@ BOOL LLWearableType::getDisableCameraSwitch(LLWearableType::EType type) { const LLWearableDictionary *dict = LLWearableDictionary::getInstance(); const WearableEntry *entry = dict->lookup(type); + if (!entry) return FALSE; return entry->mDisableCameraSwitch; } @@ -152,6 +153,7 @@ BOOL LLWearableType::getAllowMultiwear(LLWearableType::EType type) { const LLWearableDictionary *dict = LLWearableDictionary::getInstance(); const WearableEntry *entry = dict->lookup(type); + if (!entry) return FALSE; return entry->mAllowMultiwear; } |