From aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 15 Jan 2007 18:49:02 +0000
Subject: svn merge -r 56599:56738
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

---
 indra/newview/llpreviewtexture.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llpreviewtexture.cpp')

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);
+		}
 	}
 }
 
-- 
cgit v1.3