diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 12:58:01 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-28 12:58:01 +0100 |
commit | 3e1100dbfa8549e8738bc68b5a4a2e5d36a0da85 (patch) | |
tree | ba31e829f216b64207d2afc39a3991f0d7ce847c /indra/newview/llpaneleditwearable.cpp | |
parent | 8a29a2707342a592bd17b794471e3da596a70d6d (diff) | |
parent | 7e0b36d6102f5e285296cd8e0dc6961b5c73c7cb (diff) |
merge from viewer-public
Diffstat (limited to 'indra/newview/llpaneleditwearable.cpp')
-rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 9eccceca66..36f2d05fab 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -1095,6 +1095,8 @@ void LLPanelEditWearable::updateScrollingPanelUI() if(panel && (mWearablePtr->getItemID().notNull())) { const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(type); + llassert(wearable_entry); + if (!wearable_entry) return; U8 num_subparts = wearable_entry->mSubparts.size(); LLScrollingPanelParam::sUpdateDelayFrames = 0; |