From d5eef2d8a6cc0d5855d68d0726565e07d46211b2 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 3 Dec 2007 19:36:44 +0000 Subject: merge -r 73391:74133 maint-ui-3 -> release --- indra/newview/llpreviewgesture.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpreviewgesture.cpp') diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index 051e328a6b..9fa364a339 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -955,6 +955,11 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs, } else { + // Get missing gesture's name. Use UUID if name can't be found. + LLStringBase::format_map_t args; + LLInventoryItem *item = gInventory.getItem( *item_idp ); + args["[NAME]"] = item ? item->getName() : LLString( item_idp->asString() ); + if( gViewerStats ) { gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED ); @@ -963,11 +968,11 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs, if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status || LL_ERR_FILE_EMPTY == status) { - LLNotifyBox::showXml("GestureMissing"); + LLNotifyBox::showXml("GestureMissing", args); } else { - LLNotifyBox::showXml("UnableToLoadGesture"); + LLNotifyBox::showXml("UnableToLoadGesture", args); } llwarns << "Problem loading gesture: " << status << llendl; -- cgit v1.2.3