diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-02-11 11:44:21 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-02-11 11:44:21 -0800 |
commit | c7715a74fd63c5dda370a5fe07089213a53014cb (patch) | |
tree | f9fda627380aa5f20d028482fc1999e4d3232166 /indra/newview/llpanelpicks.cpp | |
parent | 494a42a680cdaa90dce677fd66ff722ccf1401f3 (diff) | |
parent | a97c4d3ad879b8e53696b9cab9c5ab7141c7fc6c (diff) |
Merge with tip
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
-rw-r--r-- | indra/newview/llpanelpicks.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index ada65c98a4..8eb0b69491 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -843,10 +843,13 @@ void LLPanelPicks::onPanelClassifiedClose(LLPanelClassifiedInfo* panel) { LLClassifiedItem* c_item = dynamic_cast<LLClassifiedItem*>( mClassifiedsList->getItemByValue(values[n])); - - c_item->setClassifiedName(panel->getClassifiedName()); - c_item->setDescription(panel->getDescription()); - c_item->setSnapshotId(panel->getSnapshotId()); + llassert(c_item); + if (c_item) + { + c_item->setClassifiedName(panel->getClassifiedName()); + c_item->setDescription(panel->getDescription()); + c_item->setSnapshotId(panel->getSnapshotId()); + } } } } |