summaryrefslogtreecommitdiff
path: root/indra/llui/lllineeditor.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-30 14:42:34 -0800
committerJames Cook <james@lindenlab.com>2009-11-30 14:42:34 -0800
commitd83f934ec87e594b7e88267bdd1be938a73f090d (patch)
tree2fc1bc60f960e3139f3da799b7d93c9a08f8e7c6 /indra/llui/lllineeditor.cpp
parent1ec8ca378814b7f493f5f6e55fb505b5c884a995 (diff)
parent7d3b3cc474822db144b623980d08b7addc2f77ff (diff)
merge
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
-rw-r--r--indra/llui/lllineeditor.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 1551aab192..8a21155cc3 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -34,6 +34,7 @@
#include "linden_common.h"
+#define LLLINEEDITOR_CPP
#include "lllineeditor.h"
#include "lltexteditor.h"
@@ -72,8 +73,8 @@ const F32 TRIPLE_CLICK_INTERVAL = 0.3f; // delay between double and triple click
static LLDefaultChildRegistry::Register<LLLineEditor> r1("line_editor");
// Compiler optimization, generate extern template
-//template class LLLineEditor* LLView::getChild<class LLLineEditor>(
-// const std::string& name, BOOL recurse) const;
+template class LLLineEditor* LLView::getChild<class LLLineEditor>(
+ const std::string& name, BOOL recurse) const;
//
// Member functions