diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llgesturemgr.cpp | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llgesturemgr.cpp')
-rw-r--r-- | linden/indra/newview/llgesturemgr.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp index 3be5d4e..27c9836 100644 --- a/linden/indra/newview/llgesturemgr.cpp +++ b/linden/indra/newview/llgesturemgr.cpp | |||
@@ -50,6 +50,7 @@ | |||
50 | // newview | 50 | // newview |
51 | #include "llagent.h" | 51 | #include "llagent.h" |
52 | #include "llchatbar.h" | 52 | #include "llchatbar.h" |
53 | #include "lldelayedgestureerror.h" | ||
53 | #include "llinventorymodel.h" | 54 | #include "llinventorymodel.h" |
54 | #include "llnotify.h" | 55 | #include "llnotify.h" |
55 | #include "llviewermessage.h" | 56 | #include "llviewermessage.h" |
@@ -1001,25 +1002,16 @@ void LLGestureManager::onLoadComplete(LLVFS *vfs, | |||
1001 | } | 1002 | } |
1002 | else | 1003 | else |
1003 | { | 1004 | { |
1004 | if( gViewerStats ) | 1005 | LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED ); |
1005 | { | ||
1006 | gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED ); | ||
1007 | } | ||
1008 | |||
1009 | // Get missing gesture's name. Use UUID if name can't be found. | ||
1010 | LLStringBase<char>::format_map_t args; | ||
1011 | LLInventoryItem *item = gInventory.getItem( item_id ); | ||
1012 | args["[NAME]"] = item ? item->getName() : LLString( item_id.asString() ); | ||
1013 | |||
1014 | 1006 | ||
1015 | if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status || | 1007 | if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status || |
1016 | LL_ERR_FILE_EMPTY == status) | 1008 | LL_ERR_FILE_EMPTY == status) |
1017 | { | 1009 | { |
1018 | LLNotifyBox::showXml("GestureMissing", args); | 1010 | LLDelayedGestureError::gestureMissing( item_id ); |
1019 | } | 1011 | } |
1020 | else | 1012 | else |
1021 | { | 1013 | { |
1022 | LLNotifyBox::showXml("UnableToLoadGesture", args); | 1014 | LLDelayedGestureError::gestureFailedToLoad( item_id ); |
1023 | } | 1015 | } |
1024 | 1016 | ||
1025 | llwarns << "Problem loading gesture: " << status << llendl; | 1017 | llwarns << "Problem loading gesture: " << status << llendl; |