summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-02-17 12:47:47 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-02-17 12:47:47 +0200
commitb53e60b8574eecb583aa3a0902280849f53012ea (patch)
tree4ba57cc934b09e4119797606834cfc46805032cf /indra/newview/llfloaterpreference.cpp
parent09a509e0073a1daa5eadf1b5bf5bdef24080ab47 (diff)
parent9cfc4c07267234ee4f218d100f7d4f27d6e3e000 (diff)
Merge from default branch.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r--indra/newview/llfloaterpreference.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 43111d76f7..f20ef76bed 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -666,7 +666,8 @@ void LLFloaterPreference::refreshEnabledGraphics()
LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
if(instance)
{
- instance->refreshEnabledState();
+ instance->refresh();
+ //instance->refreshEnabledState();
}
LLFloaterHardwareSettings* hardware_settings = LLFloaterReg::getTypedInstance<LLFloaterHardwareSettings>("prefs_hardware_settings");
if (hardware_settings)