summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-04-08 15:54:32 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-04-08 15:54:32 -0700
commit2bf967149626672584b17b53fb5d2e6186f3d896 (patch)
tree12ad7d2b1085ec1956bef0defbeac4c3c8f7650c /indra/newview
parentb84ac95c2fa3f020b656737244c38222351b8d36 (diff)
Fixed a NULL pointer crash found while using viewer. See https://osiris.lindenlab.com/viewer_crash_browser/index.php?filter_id=24941. Reviewed by Kelly
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llwearabletype.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llwearabletype.cpp b/indra/newview/llwearabletype.cpp
index f933be4d8f..5b4b820903 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;
}