aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewertexteditor.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:19 -0500
committerJacek Antonelli2008-08-15 23:45:19 -0500
commitb235c59d60472f818a9142c0886b95a0ff4191d7 (patch)
treed323c55587584b19cc43a03f58a178823f12d3cd /linden/indra/newview/llviewertexteditor.cpp
parentSecond Life viewer sources 1.18.5.3 (diff)
downloadmeta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.zip
meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.gz
meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.bz2
meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.xz
Second Life viewer sources 1.18.6.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewertexteditor.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 1e75e42..e89f3f9 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -37,6 +37,7 @@
37#include "llinventory.h" 37#include "llinventory.h"
38#include "llinventorymodel.h" 38#include "llinventorymodel.h"
39#include "llinventoryview.h" 39#include "llinventoryview.h"
40#include "llinventorybridge.h" // for landmark prefix string
40 41
41#include "llviewertexteditor.h" 42#include "llviewertexteditor.h"
42 43
@@ -58,7 +59,7 @@
58#include "llmemorystream.h" 59#include "llmemorystream.h"
59#include "llmenugl.h" 60#include "llmenugl.h"
60 61
61extern BOOL gPacificDaylightTime; 62#include "llappviewer.h" // for gPacificDaylightTime
62 63
63///---------------------------------------------------------------------------- 64///----------------------------------------------------------------------------
64/// Class LLEmbeddedNotecardOpener 65/// Class LLEmbeddedNotecardOpener
@@ -1399,7 +1400,9 @@ void LLViewerTextEditor::openEmbeddedSound( LLInventoryItem* item )
1399 1400
1400void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item ) 1401void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item )
1401{ 1402{
1402 open_landmark((LLViewerInventoryItem*)item, " preview landmark", FALSE, item->getUUID(), TRUE); 1403 LLString title =
1404 LLString(" ") + LLLandmarkBridge::prefix() + item->getName();
1405 open_landmark((LLViewerInventoryItem*)item, title, FALSE, item->getUUID(), TRUE);
1403} 1406}
1404 1407
1405void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, BOOL saved ) 1408void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, BOOL saved )