summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-02-16 23:36:54 -0500
committerKent Quirk <q@lindenlab.com>2010-02-16 23:36:54 -0500
commite3a71c74e24cc052bab14544730bcd9bcef35ca8 (patch)
tree109f6c98feea64f01330960407634eee9196356b /indra/newview/llfloaterpreference.cpp
parent69032d8d9d660de5b3c97589b7cc55dac70b153c (diff)
parent6552874c82ed5ed09cf0a4d16351cdd5c8698755 (diff)
automated merge from viewer-2-0
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)