Second Life viewer sources 1.19.0.0

1 files changed, 10 insertions, 5 deletions

diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index 0d2c97a..1bd86fc 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.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,
@@ -955,6 +955,11 @@ 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 );
@@ -963,11 +968,11 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs,
                         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;
@@ -1602,7 +1607,7 @@ void LLPreviewGesture::onClickAdd(void* data)
         if (!library_item) return;
 
         const LLScrollListCell* library_cell = library_item->getColumn(0);
-        const std::string& library_text = library_cell->getText();
+        const std::string& library_text = library_cell->getValue().asString();
 
         self->addStep(library_text);