From f0452c181d0d561501f3a14039f79e996901ac8c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 10 Mar 2020 08:16:54 -0400
Subject: [PATCH] Disable RLV setenv until upstream fixes it
---
indra/newview/rlvextensions.cpp | 36 ++++++++++++------------
indra/newview/rlvhandler.cpp | 49 ++++++++++++++++-----------------
2 files changed, 41 insertions(+), 44 deletions(-)
diff --git a/indra/newview/rlvextensions.cpp b/indra/newview/rlvextensions.cpp
index baa2be38fcf..00dcd5cf38a 100644
--- a/indra/newview/rlvextensions.cpp
+++ b/indra/newview/rlvextensions.cpp
@@ -17,16 +17,14 @@
#include "llviewerprecompiledheaders.h"
#include "llagent.h"
#include "llagentcamera.h"
-#include "lldaycyclemanager.h"
#include "llvoavatarself.h"
-#include "llwlparammanager.h"
#include "rlvextensions.h"
#include "rlvhandler.h"
#include "rlvhelper.h"
// ============================================================================
-
+/*
class RlvWindLightControl
{
public:
@@ -370,7 +368,7 @@ bool RlvWindLight::setValue(const std::string& strRlvName, const std::string& st
}
return false;
}
-
+*/
// ============================================================================
std::map<std::string, S16> RlvExtGetSet::m_DbgAllowed;
@@ -441,21 +439,21 @@ bool RlvExtGetSet::processCommand(const RlvCommand& rlvCmd, ERlvCmdRet& eRet)
}
else if ("env" == strBehaviour)
{
- bool fError = false;
- if ( ("get" == strGetSet) && (RLV_TYPE_REPLY == rlvCmd.getParamType()) )
- {
- RlvUtil::sendChatReply(rlvCmd.getParam(), RlvWindLight::instance().getValue(strSetting, fError));
- eRet = (!fError) ? RLV_RET_SUCCESS : RLV_RET_FAILED_UNKNOWN;
- return true;
- }
- else if ( ("set" == strGetSet) && (RLV_TYPE_FORCE == rlvCmd.getParamType()) )
- {
- if (!gRlvHandler.hasBehaviourExcept(RLV_BHVR_SETENV, rlvCmd.getObjectID()))
- eRet = (RlvWindLight::instance().setValue(strSetting, rlvCmd.getOption())) ? RLV_RET_SUCCESS : RLV_RET_FAILED_UNKNOWN;
- else
- eRet = RLV_RET_FAILED_LOCK;
- return true;
- }
+ //bool fError = false;
+ //if ( ("get" == strGetSet) && (RLV_TYPE_REPLY == rlvCmd.getParamType()) )
+ //{
+ // RlvUtil::sendChatReply(rlvCmd.getParam(), RlvWindLight::instance().getValue(strSetting, fError));
+ // eRet = (!fError) ? RLV_RET_SUCCESS : RLV_RET_FAILED_UNKNOWN;
+ // return true;
+ //}
+ //else if ( ("set" == strGetSet) && (RLV_TYPE_FORCE == rlvCmd.getParamType()) )
+ //{
+ // if (!gRlvHandler.hasBehaviourExcept(RLV_BHVR_SETENV, rlvCmd.getObjectID()))
+ // eRet = (RlvWindLight::instance().setValue(strSetting, rlvCmd.getOption())) ? RLV_RET_SUCCESS : RLV_RET_FAILED_UNKNOWN;
+ // else
+ // eRet = RLV_RET_FAILED_LOCK;
+ // return true;
+ //}
}
}
else if ("setrot" == rlvCmd.getBehaviour())
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index db9e182b83c..a4eaf4a0c23 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -37,7 +37,6 @@
#include "llavataractions.h" // @stopim IM query
#include "llavatarnamecache.h" // @shownames
#include "llavatarlist.h" // @shownames
-#include "llenvmanager.h" // @setenv
#include "llfloatersidepanelcontainer.h"// @shownames
#include "llnotifications.h" // @list IM query
#include "llnotificationsutil.h"
@@ -2236,30 +2235,30 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SETDEBUG>::onCommandToggle(ERlvBehaviour
template<> template<>
void RlvBehaviourToggleHandler<RLV_BHVR_SETENV>::onCommandToggle(ERlvBehaviour eBhvr, bool fHasBhvr)
{
- const std::string strEnvFloaters[] = { "env_post_process", "env_settings", "env_delete_preset", "env_edit_sky", "env_edit_water", "env_edit_day_cycle" };
- for (int idxFloater = 0, cntFloater = sizeof(strEnvFloaters) / sizeof(std::string); idxFloater < cntFloater; idxFloater++)
- {
- if (fHasBhvr)
- {
- // Hide the floater if it's currently visible
- LLFloaterReg::const_instance_list_t envFloaters = LLFloaterReg::getFloaterList(strEnvFloaters[idxFloater]);
- for (LLFloater* pFloater : envFloaters)
- pFloater->closeFloater();
- RlvUIEnabler::instance().addGenericFloaterFilter(strEnvFloaters[idxFloater]);
- }
- else
- {
- RlvUIEnabler::instance().removeGenericFloaterFilter(strEnvFloaters[idxFloater]);
- }
- }
-
- // Don't allow toggling "Basic Shaders" and/or "Atmopsheric Shaders" through the debug settings under @setenv=n
- gSavedSettings.getControl("VertexShaderEnable")->setHiddenFromSettingsEditor(fHasBhvr);
- gSavedSettings.getControl("WindLightUseAtmosShaders")->setHiddenFromSettingsEditor(fHasBhvr);
-
- // Restore the user's WindLight preferences when releasing
- if (!fHasBhvr)
- LLEnvManagerNew::instance().usePrefs();
+ //const std::string strEnvFloaters[] = { "env_post_process", "env_settings", "env_delete_preset", "env_edit_sky", "env_edit_water", "env_edit_day_cycle" };
+ //for (int idxFloater = 0, cntFloater = sizeof(strEnvFloaters) / sizeof(std::string); idxFloater < cntFloater; idxFloater++)
+ //{
+ // if (fHasBhvr)
+ // {
+ // // Hide the floater if it's currently visible
+ // LLFloaterReg::const_instance_list_t envFloaters = LLFloaterReg::getFloaterList(strEnvFloaters[idxFloater]);
+ // for (LLFloater* pFloater : envFloaters)
+ // pFloater->closeFloater();
+ // RlvUIEnabler::instance().addGenericFloaterFilter(strEnvFloaters[idxFloater]);
+ // }
+ // else
+ // {
+ // RlvUIEnabler::instance().removeGenericFloaterFilter(strEnvFloaters[idxFloater]);
+ // }
+ //}
+
+ //// Don't allow toggling "Basic Shaders" and/or "Atmopsheric Shaders" through the debug settings under @setenv=n
+ //gSavedSettings.getControl("VertexShaderEnable")->setHiddenFromSettingsEditor(fHasBhvr);
+ //gSavedSettings.getControl("WindLightUseAtmosShaders")->setHiddenFromSettingsEditor(fHasBhvr);
+
+ //// Restore the user's WindLight preferences when releasing
+ //if (!fHasBhvr)
+ // LLEnvManagerNew::instance().usePrefs();
}
// Handles: @showhovertext:<uuid>=n|y
--
GitLab