summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-15 18:21:08 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-15 18:21:08 +0000
commit7286516e9193e7549c9d8ecde65df85402443fab (patch)
tree236b1c50e3f5ed5bfa85abb7d1d54cbc1a384d7b /indra/newview/llpreviewscript.cpp
parent1bb68d936de2657c3bce3bbe64947f043b5f7333 (diff)
parent398af7dd40a060cf9ad8d799df03d448c2f53a96 (diff)
viewer2 merge
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
-rw-r--r--indra/newview/llpreviewscript.cpp6
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();