From 8c344f4da02105428c5933501d028a4a8908a657 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 9 Jan 2007 20:19:31 +0000 Subject: svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --- indra/newview/llinventorymodel.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'indra/newview/llinventorymodel.cpp') diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 509f040c34..f1c4f0d918 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -2340,19 +2340,25 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account, boo open_notecard( lastitem->getUUID(), LLString("Note: ") + lastitem->getName(), - show_keep_discard); + show_keep_discard, + LLUUID::null, + FALSE); break; case LLAssetType::AT_LANDMARK: open_landmark( lastitem->getUUID(), LLString(" ") + lastitem->getName(), - show_keep_discard); + show_keep_discard, + LLUUID::null, + FALSE); break; case LLAssetType::AT_TEXTURE: open_texture( lastitem->getUUID(), LLString("Texture: ") + lastitem->getName(), - show_keep_discard); + show_keep_discard, + LLUUID::null, + FALSE); break; default: break; -- cgit v1.2.3