diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-02-16 23:36:54 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-02-16 23:36:54 -0500 |
| commit | e3a71c74e24cc052bab14544730bcd9bcef35ca8 (patch) | |
| tree | 109f6c98feea64f01330960407634eee9196356b /indra/newview/llpreviewscript.cpp | |
| parent | 69032d8d9d660de5b3c97589b7cc55dac70b153c (diff) | |
| parent | 6552874c82ed5ed09cf0a4d16351cdd5c8698755 (diff) | |
automated merge from viewer-2-0
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 3221745fa3..f5a9f82d50 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -955,8 +955,12 @@ BOOL LLPreviewLSL::postBuild() { const LLInventoryItem* item = getItem(); + llassert(item); + if (item) + { + childSetText("desc", item->getDescription()); + } childSetCommitCallback("desc", LLPreview::onText, this); - childSetText("desc", item->getDescription()); childSetPrevalidate("desc", &LLTextValidate::validateASCIIPrintableNoPipe); return LLPreview::postBuild(); |