diff options
Diffstat (limited to 'indra/newview/llgesturemgr.cpp')
| -rw-r--r-- | indra/newview/llgesturemgr.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp index 32c712d926..51e28047f5 100644 --- a/indra/newview/llgesturemgr.cpp +++ b/indra/newview/llgesturemgr.cpp @@ -50,6 +50,7 @@ // newview #include "llagent.h" #include "llchatbar.h" +#include "lldelayedgestureerror.h" #include "llinventorymodel.h" #include "llnotify.h" #include "llviewermessage.h" @@ -1006,20 +1007,14 @@ 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", args); + LLDelayedGestureError::gestureMissing( item_id ); } else { - LLNotifyBox::showXml("UnableToLoadGesture", args); + LLDelayedGestureError::gestureFailedToLoad( item_id ); } llwarns << "Problem loading gesture: " << status << llendl; |