From ddcd86d633ee7b55e6955cb756bbbe6b815e5080 Mon Sep 17 00:00:00 2001 From: Cinders Date: Sat, 29 Jun 2013 13:12:49 -0600 Subject: [PATCH] RLVa update in kcwlinterface.cpp --- indra/newview/kcwlinterface.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/newview/kcwlinterface.cpp b/indra/newview/kcwlinterface.cpp index 72eaab0da0..d414c8eecf 100644 --- a/indra/newview/kcwlinterface.cpp +++ b/indra/newview/kcwlinterface.cpp @@ -42,6 +42,7 @@ #include #include "rlvhandler.h" +#include "rlvactions.h" const F32 PARCEL_WL_CHECK_TIME = 5; const S32 PARCEL_WL_MIN_ALT_CHANGE = 3; @@ -222,7 +223,7 @@ void KCWindlightInterface::ApplySkySettings(const LLSD& settings) void KCWindlightInterface::ApplyWindLightPreset(const std::string& preset) { - if (rlv_handler_t::isEnabled() && gRlvHandler.hasBehaviour(RLV_BHVR_SETENV)) + if (rlv_handler_t::isEnabled() && RlvActions::hasBehaviour(RLV_BHVR_SETENV)) return; LLWLParamManager* wlprammgr = LLWLParamManager::getInstance(); @@ -244,7 +245,7 @@ void KCWindlightInterface::ApplyWindLightPreset(const std::string& preset) void KCWindlightInterface::ResetToRegion(bool force) { - if (rlv_handler_t::isEnabled() && gRlvHandler.hasBehaviour(RLV_BHVR_SETENV)) + if (rlv_handler_t::isEnabled() && RlvActions::hasBehaviour(RLV_BHVR_SETENV)) return; //TODO: clear per parcel @@ -588,7 +589,7 @@ bool KCWindlightInterface::checkSettings() static LLCachedControl sFSWLParcelEnabled(gSavedSettings, "FSWLParcelEnabled"); static LLCachedControl sUseEnvironmentFromRegionAlways(gSavedSettings, "UseEnvironmentFromRegionAlways"); if (!sFSWLParcelEnabled || !sUseEnvironmentFromRegionAlways || - (rlv_handler_t::isEnabled() && gRlvHandler.hasBehaviour(RLV_BHVR_SETENV))) + (rlv_handler_t::isEnabled() && RlvActions::hasBehaviour(RLV_BHVR_SETENV))) { // The setting changed, clear everything if (!mDisabled)