diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
commit | 3f43a36d3430e94046d40cb898a9fd34cce0f7d5 (patch) | |
tree | c3c483b3ce49ea5fcabe3041213223112edfba86 /indra/newview/llfloatersettingsdebug.cpp | |
parent | 422780c88a98ad0b78c54a71189219de12992bc2 (diff) | |
parent | 011f6f9ad07d0a71c9a392f5e25af2aad69110ee (diff) |
merge fixes for VWR-23296
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)); |