diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-01-09 15:25:06 -0800 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-01-09 15:25:06 -0800 |
| commit | c4a1bd1c2f2e8da202c59d756e5d49b273e5145c (patch) | |
| tree | 96f3ccbb2c5d534f021052fafab97bedd6d57e91 /indra/newview/llviewertexteditor.cpp | |
| parent | b0c449d301299a4ba1b7d83e930f9df6b071b931 (diff) | |
| parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) | |
viewer-development merge
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()); } } |