diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-12-21 06:44:41 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-12-21 06:44:41 +0000 |
| commit | df4d167cd13fd89a85e4d30dca94e40c934707d7 (patch) | |
| tree | cde9373bce657013bf04c83ab60b4a4aa826fc76 /indra/newview/llviewertexteditor.cpp | |
| parent | 8fde5f0d3241205067e5d7bf5380757e764eff31 (diff) | |
svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index 18f07efb44..5c613052ea 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -37,6 +37,7 @@ #include "llinventory.h" #include "llinventorymodel.h" #include "llinventoryview.h" +#include "llinventorybridge.h" // for landmark prefix string #include "llviewertexteditor.h" @@ -1391,7 +1392,9 @@ void LLViewerTextEditor::openEmbeddedSound( LLInventoryItem* item ) void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item ) { - open_landmark((LLViewerInventoryItem*)item, " preview landmark", FALSE, item->getUUID(), TRUE); + LLString title = + LLString(" ") + LLLandmarkBridge::prefix() + item->getName(); + open_landmark((LLViewerInventoryItem*)item, title, FALSE, item->getUUID(), TRUE); } void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, BOOL saved ) |