aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatertest.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llfloatertest.cpp
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llfloatertest.cpp')
-rw-r--r--linden/indra/newview/llfloatertest.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/linden/indra/newview/llfloatertest.cpp b/linden/indra/newview/llfloatertest.cpp
index 2346e3e..b18dabb 100644
--- a/linden/indra/newview/llfloatertest.cpp
+++ b/linden/indra/newview/llfloatertest.cpp
@@ -52,7 +52,7 @@
52#include "llviewborder.h" 52#include "llviewborder.h"
53 53
54#include "llnamelistctrl.h" 54#include "llnamelistctrl.h"
55#include "llvieweruictrlfactory.h" 55#include "lluictrlfactory.h"
56#include "llviewercontrol.h" 56#include "llviewercontrol.h"
57 57
58class LLFloaterTestImpl : public LLFloater 58class LLFloaterTestImpl : public LLFloater
@@ -254,11 +254,7 @@ LLFloaterTestImpl::LLFloaterTestImpl()
254 onCommitLine, 254 onCommitLine,
255 onKeyLine, 255 onKeyLine,
256 onFocusLostLine, 256 onFocusLostLine,
257 this, 257 this);
258 NULL, // prevalidate func
259 LLViewBorder::BEVEL_IN,
260 LLViewBorder::STYLE_LINE,
261 1); // border thickness
262 line->setHandleEditKeysDirectly(true); 258 line->setHandleEditKeysDirectly(true);
263 panel->addChild(line); 259 panel->addChild(line);
264 260
@@ -386,5 +382,5 @@ LLFloaterTest::~LLFloaterTest()
386 382
387LLFloaterSimple::LLFloaterSimple(const std::string& xml_filename) 383LLFloaterSimple::LLFloaterSimple(const std::string& xml_filename)
388{ 384{
389 gUICtrlFactory->buildFloater(this, xml_filename); 385 LLUICtrlFactory::getInstance()->buildFloater(this, xml_filename);
390} 386}