diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-03-19 00:01:42 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-03-19 00:01:42 +0000 |
| commit | 25de7377c1f6cc2fa6f217b9e9eaca84ab36748d (patch) | |
| tree | ea1770b154433082dbcf06da043c0c3a45f7c5f3 /indra/newview/llpreviewgesture.cpp | |
| parent | 2d9afdaa03f0d44d05e3f2fb9d99dd5b059a9cac (diff) | |
QAR-377 maintenance-6 merge:
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
Diffstat (limited to 'indra/newview/llpreviewgesture.cpp')
| -rw-r--r-- | indra/newview/llpreviewgesture.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index ba2925d45a..691a786245 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -49,6 +49,7 @@ #include "llbutton.h" #include "llcheckboxctrl.h" #include "llcombobox.h" +#include "lldelayedgestureerror.h" #include "llfloatergesture.h" // for some label constants #include "llgesturemgr.h" #include "llinventorymodel.h" @@ -955,11 +956,6 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs, } else { - // Get missing gesture's name. Use UUID if name can't be found. - LLStringBase<char>::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 ); @@ -968,11 +964,11 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs, if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status || LL_ERR_FILE_EMPTY == status) { - LLNotifyBox::showXml("GestureMissing", args); + LLDelayedGestureError::gestureMissing( *item_idp ); } else { - LLNotifyBox::showXml("UnableToLoadGesture", args); + LLDelayedGestureError::gestureFailedToLoad( *item_idp ); } llwarns << "Problem loading gesture: " << status << llendl; |