diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-29 16:24:58 -0700 |
| commit | 86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (patch) | |
| tree | 35ab8edbc364a05a5d29d343f63b22e01ea5cb38 /indra/newview/llpanelpicks.cpp | |
| parent | 3fca923949667d1c713119043cd4aaeae4acfe09 (diff) | |
| parent | 8654ba5e2571e07c8d2fd898027abf6f85777905 (diff) | |
Automated merge
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(); |