diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
| commit | aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 (patch) | |
| tree | 5aedb2a22e54d9c2c2fe9389d4ad6cebe891c5f1 /indra/newview/llpreviewtexture.cpp | |
| parent | dbf45ad4294a59c050982b5a417fe86272026454 (diff) | |
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
| -rw-r--r-- | indra/newview/llpreviewtexture.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index a50ded3b53..d1817c8cda 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -157,9 +157,12 @@ void LLPreviewTexture::init() { LLInventoryItem* item = getItem(); - childSetCommitCallback("desc", LLPreview::onText, this); - childSetText("desc", item->getDescription()); - childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe); + if (item) + { + childSetCommitCallback("desc", LLPreview::onText, this); + childSetText("desc", item->getDescription()); + childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe); + } } } |