summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2010-04-07 13:38:21 +0300
committerEugene Mutavchi <emutavchi@productengine.com>2010-04-07 13:38:21 +0300
commit8723a285fae8afa0ad7458c9a9ac00ac4504239b (patch)
treead814c36c06714f35676960c31401fd8b07ef6fc
parent5b8ea41e42dc7d9ea5d9a4c7bd477a88e62b8bf8 (diff)
Fixed normal bug EXT-6600(Block List button in Preferences does nothing prior to login (should be disabled)) - added disabling of Block List button if user is not logged in.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/186/ --HG-- branch : product-engine
-rw-r--r--indra/newview/llfloaterpreference.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 804ef609ec..4c4ccc02d7 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -107,6 +107,8 @@
#include "llpluginclassmedia.h"
#include "llteleporthistorystorage.h"
+#include "lllogininstance.h" // to check if logged in yet
+
const F32 MAX_USER_FAR_CLIP = 512.f;
const F32 MIN_USER_FAR_CLIP = 64.f;
@@ -858,6 +860,8 @@ void LLFloaterPreference::refreshEnabledState()
ctrl_wind_light->setEnabled(ctrl_shader_enable->getEnabled() && shaders);
// now turn off any features that are unavailable
disableUnavailableSettings();
+
+ childSetEnabled ("block_list", LLLoginInstance::getInstance()->authSuccess());
}
void LLFloaterPreference::disableUnavailableSettings()