diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 13:03:35 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 13:03:35 +0100 |
| commit | adce2ecdf8f3a0efcd4907699d286012124ac496 (patch) | |
| tree | f36622a23028b73946bd3b70fd741b4f30464e33 /indra/newview/llfloaterpreference.cpp | |
| parent | 8da371b0f08f92fb1fef083f0bfb526f0698afd7 (diff) | |
| parent | 7dd71a60c51ed81c1ddfa98d09a158488a85b753 (diff) | |
PE merge from pe-viewer-trunk
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index de025ac6b9..60ce16aafb 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() |