diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-03-24 09:17:08 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-03-24 09:17:08 +0200 |
commit | 07de4edbc45de93c04bc4d0a7c174a45c902b50f (patch) | |
tree | 14d90da452bb109e6f94567f057fac5f41ef0cf0 /indra/newview/llpanelpicks.cpp | |
parent | 2edbd733843d5ad0f9ec3dec49e676651bda07af (diff) | |
parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
-rw-r--r-- | indra/newview/llpanelpicks.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 0a7c39db46..6f920cf4b9 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -827,7 +827,11 @@ void LLPanelPicks::onPanelClassifiedSave(LLPanelClassifiedEdit* panel) else if(panel->isNewWithErrors()) { LLClassifiedItem* c_item = dynamic_cast<LLClassifiedItem*>(mClassifiedsList->getSelectedItem()); - c_item->fillIn(panel); + llassert(c_item); + if (c_item) + { + c_item->fillIn(panel); + } } else { @@ -970,6 +974,11 @@ void LLPanelPicks::onPanelClassifiedEdit() } LLClassifiedItem* c_item = dynamic_cast<LLClassifiedItem*>(mClassifiedsList->getSelectedItem()); + llassert(c_item); + if (!c_item) + { + return; + } LLSD params; params["classified_id"] = c_item->getClassifiedId(); |