diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2012-08-23 12:35:10 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2012-08-23 12:35:10 +0300 |
| commit | 67750daf2318f5b91694fc8beb78f7b89880a6d1 (patch) | |
| tree | 4943e7d8cf1f25db9563e8bb8d5561d2c4b27dee | |
| parent | cf498ad1dec06221f0843097ef4b4b1161d9826c (diff) | |
MAINT-836 FIXED Set title and description for Preview Texture floater if it's called from link in notecard
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index 99102309a1..122d8f4a96 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -1144,6 +1144,14 @@ void LLViewerTextEditor::openEmbeddedTexture( LLInventoryItem* item, llwchar wc { preview->setAuxItem( item ); preview->setNotecardInfo(mNotecardInventoryID, mObjectID); + if (preview->hasString("Title")) + { + LLStringUtil::format_map_t args; + args["[NAME]"] = item->getName(); + LLUIString title = preview->getString("Title", args); + preview->setTitle(title.getString()); + } + preview->getChild<LLUICtrl>("desc")->setValue(item->getDescription()); } } |