diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:21:18 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:21:18 -0400 |
commit | d65e512fa3a0e7bc7f1c269d2c8d2e1c38c4e970 (patch) | |
tree | 324168722ec39359f4753aa4acf6ca65c8b72ab3 /indra/newview/llfloatersettingsdebug.cpp | |
parent | d3e71fdc2c35ab75ebdac573698bbb86bbd0d98f (diff) | |
parent | d3a9d6a6cef6630995c652b4cc04c8807dbe6d4e (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llfloatersettingsdebug.cpp')
-rw-r--r-- | indra/newview/llfloatersettingsdebug.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index 41a05055fe..71882fbb83 100644 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -39,7 +39,6 @@ LLFloaterSettingsDebug::LLFloaterSettingsDebug(const LLSD& key) : LLFloater(key) { - //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_settings_debug.xml"); mCommitCallbackRegistrar.add("SettingSelect", boost::bind(&LLFloaterSettingsDebug::onSettingSelect, this,_1)); mCommitCallbackRegistrar.add("CommitSettings", boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this)); mCommitCallbackRegistrar.add("ClickDefault", boost::bind(&LLFloaterSettingsDebug::onClickDefault, this)); |