Second Life viewer sources 1.19.0.0

1 files changed, 10 insertions, 4 deletions

diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index dd79397..3be5d4e 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -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;