livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RLVa update in kcwlinterface.cpp

meow-7.2.2
Cinders 2013-06-29 13:12:49 -06:00
parent 892878b63e
commit ddcd86d633
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/kcwlinterface.cpp
View File

@ -42,6 +42,7 @@
#include <boost/regex.hpp>
#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<bool> sFSWLParcelEnabled(gSavedSettings, "FSWLParcelEnabled");
static LLCachedControl<bool> 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)