diff options
author | Merov Linden <merov@lindenlab.com> | 2010-10-12 16:08:31 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-10-12 16:08:31 -0700 |
commit | e3ecffc180ae50a0e8b726a061ec39cbe591326e (patch) | |
tree | 3501d25df3c89517988251557e34a9fc268287f1 /indra/newview/llfloaterbeacons.cpp | |
parent | 88e33d00cd189aec6ef9b5aa481d4d9a2777b1fb (diff) | |
parent | a8fbfa40ba6153668e1f713ae0e128224b4f400f (diff) |
Pull update from viewer-development
Diffstat (limited to 'indra/newview/llfloaterbeacons.cpp')
-rw-r--r-- | indra/newview/llfloaterbeacons.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp index 0b8605d041..e24df948c4 100644 --- a/indra/newview/llfloaterbeacons.cpp +++ b/indra/newview/llfloaterbeacons.cpp @@ -36,8 +36,6 @@ LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed) : LLFloater(seed) { -// LLUICtrlFactory::getInstance()->buildFloater(this, "floater_beacons.xml"); - // Initialize pipeline states from saved settings. // OK to do at floater constructor time because beacons do not display unless the floater is open // therefore it is OK to not initialize the pipeline state before needed. |