merge

1 files changed, 9 insertions, 2 deletions

diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index c8af5b6718..c4211d5508 100755
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -905,7 +905,11 @@ void LLTaskTextureBridge::openItem()
 	LLPreviewTexture* preview = LLFloaterReg::showTypedInstance<LLPreviewTexture>("preview_texture", LLSD(mUUID), TAKE_FOCUS_YES);
 	if(preview)
 	{
-		preview->setAuxItem(findItem());
+	    LLInventoryItem* item = findItem();
+	    if(item)
+	    {
+	        preview->setAuxItem(item);
+	    }
 		preview->setObjectID(mPanel->getTaskUUID());
 	}
 }
@@ -1171,7 +1175,10 @@ void LLTaskNotecardBridge::openItem()
 		|| object->permModify()
 		|| gAgent.isGodlike())
 	{
-		LLPreviewNotecard* preview = LLFloaterReg::showTypedInstance<LLPreviewNotecard>("preview_notecard", LLSD(mUUID), TAKE_FOCUS_YES);
+	    LLSD floater_key;
+	    floater_key["taskid"] = mPanel->getTaskUUID();
+	    floater_key["itemid"] = mUUID;
+	    LLPreviewNotecard* preview = LLFloaterReg::showTypedInstance<LLPreviewNotecard>("preview_notecard", floater_key, TAKE_FOCUS_YES);
 		if (preview)
 		{
 			preview->setObjectID(mPanel->getTaskUUID());