diff options
author | Richard Linden <none@none> | 2012-09-06 11:47:48 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-09-06 11:47:48 -0700 |
commit | 371b66a6ef7eb2568e3127c1c59326bce6e26ab8 (patch) | |
tree | 9154fa799fc37df8cb493f921b41ad79596e903c /indra/newview/llviewertexteditor.cpp | |
parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
parent | 2cdfb170216c798c637081b0e28ec8921f0b777b (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
-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()); } } |