diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-09 20:19:31 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-09 20:19:31 +0000 |
| commit | 8c344f4da02105428c5933501d028a4a8908a657 (patch) | |
| tree | 1463f67247c48a7420620917aa7fde5d6a810820 /indra/newview/llinventorymodel.cpp | |
| parent | 8534623734e64387736ddb76683939104d796ade (diff) | |
svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
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; |