diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-08 10:47:25 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-08 10:47:25 -0400 |
commit | bb74487c859acccb8f88002630606419761136e4 (patch) | |
tree | eadeabd044a9fa06c789b957d9b2c823c47617dd /indra/newview/llfloaterhardwaresettings.cpp | |
parent | 970ce1e1626c205302c4085610819571c1ce79f4 (diff) | |
parent | d25a30e55b7e6a20173c3a53891489adc5610d72 (diff) |
Merge fixes for VWR-23047, VWR-20911, and SNOW-748
Diffstat (limited to 'indra/newview/llfloaterhardwaresettings.cpp')
-rw-r--r-- | indra/newview/llfloaterhardwaresettings.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp index 2985626bd7..77af054522 100644 --- a/indra/newview/llfloaterhardwaresettings.cpp +++ b/indra/newview/llfloaterhardwaresettings.cpp @@ -56,7 +56,6 @@ LLFloaterHardwareSettings::LLFloaterHardwareSettings(const LLSD& key) mFogRatio(0.0), mProbeHardwareOnStartup(FALSE) { - //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hardware_settings.xml"); } LLFloaterHardwareSettings::~LLFloaterHardwareSettings() |