diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-03 19:36:44 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-03 19:36:44 +0000 |
| commit | d5eef2d8a6cc0d5855d68d0726565e07d46211b2 (patch) | |
| tree | 0138cd5a59971a52b20627f28af4197198f4e2f9 /indra/newview/llgesturemgr.cpp | |
| parent | 7b7dd4e6f61aa731ef7f9f255014f5b76d5b9fec (diff) | |
merge -r 73391:74133 maint-ui-3 -> release
Diffstat (limited to 'indra/newview/llgesturemgr.cpp')
| -rw-r--r-- | indra/newview/llgesturemgr.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp index 537cadf1d1..32c712d926 100644 --- a/indra/newview/llgesturemgr.cpp +++ b/indra/newview/llgesturemgr.cpp @@ -1006,14 +1006,20 @@ void LLGestureManager::onLoadComplete(LLVFS *vfs, gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED ); } + // Get missing gesture's name. Use UUID if name can't be found. + LLStringBase<char>::format_map_t args; + LLInventoryItem *item = gInventory.getItem( item_id ); + args["[NAME]"] = item ? item->getName() : LLString( item_id.asString() ); + + 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; |