diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-13 01:28:38 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-13 01:28:38 -0400 |
| commit | 39c2a584f47785c826c3bc133106f3689120bf32 (patch) | |
| tree | 898695d92fc467672618f08260106ab773e456b5 /indra/newview/llviewertexteditor.cpp | |
| parent | a15feff98c13cd693e60fc59345609c007de16db (diff) | |
| parent | efd58603da6062d90a5d7019987409994bc73858 (diff) | |
Merged latest viewer-2.0.0-3 change up through svn r130333 into login-api.
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index afee30293a..9e0713b494 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -50,7 +50,6 @@ #include "llpreview.h" #include "llpreviewtexture.h" #include "llpreviewnotecard.h" -#include "llpreviewlandmark.h" #include "llscrollbar.h" #include "llsidetray.h" #include "lltooldraganddrop.h" @@ -1377,12 +1376,6 @@ void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item, llwchar wc { panel->setItem(item); } - -// LLPreviewLandmark* preview = LLFloaterReg::showTypedInstance<LLPreviewLandmark>("preview_landmark", LLSD(item->getUUID()), TAKE_FOCUS_YES); -// if (preview) -// { -// preview->setItem( item ); -// } } void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, llwchar wc ) |