diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 4797b614db0d7dcdcfc2180c1117567622b5edef..9ee9c5be7d9a0091bf000610a96de8b616561f58 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -6090,11 +6090,11 @@ void LLPickInfo::fetchResults()
// [RLVa:KB] - Checked: RLVa-2.2 (@setoverlay)
if ( (RlvActions::hasBehaviour(RLV_BHVR_SETOVERLAY)) && (hit_object) && (!hit_object->isHUDAttachment()) )
{
- std::list<LLVisualEffect*> effects;
+ std::list<RlvOverlayEffect*> effects;
LLVfxManager::instance().getEffects<RlvOverlayEffect>(effects);
- for (const LLVisualEffect* pEffect : effects)
+ for (const RlvOverlayEffect* pEffect : effects)
{
- if (pEffect->getEnabled() && static_cast<const RlvOverlayEffect*>(pEffect)->hitTest(mMousePt))
+ if (pEffect->getEnabled() && pEffect->hitTest(mMousePt))
{
hit_object = nullptr;
break;
diff --git a/indra/newview/llvisualeffect.h b/indra/newview/llvisualeffect.h
index 19be8b0d6b9c11166fcc7ef0143f5f8a013762fa..4aea85aeeb1b10f33d430a3006205cc8a2150425 100644
--- a/indra/newview/llvisualeffect.h
+++ b/indra/newview/llvisualeffect.h
@@ -170,7 +170,7 @@ class LLVfxManager final : public LLSingleton<LLVfxManager>
LLVisualEffect* getEffect(EVisualEffect eCode, const LLUUID& idEffect) const;
template<typename T> T* getEffect(const LLUUID& idEffect) const { return dynamic_cast<T*>(getEffect(T::EffectCode, idEffect)); }
bool getEffects(std::list<LLVisualEffect*>& effectList, std::function<bool(const LLVisualEffect*)> fnFilter);
- template<typename T> bool getEffects(std::list<LLVisualEffect*>& effectList) { return getEffects(effectList, [](const LLVisualEffect* pEffect) { return pEffect->getCode() == T::EffectCode; }); }
+ template<typename T> bool getEffects(std::list<T*>& effectList);
bool hasEffect(EVisualEffect eCode) const;
bool removeEffect(EVisualEffect eCode, const LLUUID& idEffect);
template<typename T> bool removeEffect(const LLUUID& idEffect) { return removeEffect(T::EffectCode, idEffect); }
@@ -197,4 +197,23 @@ inline bool LLVfxManager::hasEffect(EVisualEffect eCode) const
return m_Effects.end() != std::find_if(m_Effects.begin(), m_Effects.end(), [eCode](const LLVisualEffect* pEffect) { return pEffect->getCode() == eCode; });
}
+template<typename T>
+inline bool LLVfxManager::getEffects(std::list<T*>& effectList)
+{
+ effectList.clear();
+
+ std::function<bool(const LLVisualEffect*)> fnFilter = [](const LLVisualEffect* pEffect) { return pEffect->getCode() == T::EffectCode; };
+ auto itEffect = boost::make_filter_iterator(fnFilter, m_Effects.begin(), m_Effects.end()),
+ endEffect = boost::make_filter_iterator(fnFilter, m_Effects.end(), m_Effects.end());
+ while (itEffect != endEffect)
+ {
+ if (T* pEffect = dynamic_cast<T*>(*itEffect++))
+ {
+ effectList.push_back(pEffect);
+ }
+ }
+
+ return effectList.size();
+}
+
// ============================================================================
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 7aaec95a6d62b634e31107afbe4c52da9bfc1bf2..f518d02700535414223737b9ae1173d5c765d62e 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -250,6 +250,7 @@ enum ERlvBehaviour {
// Effects
RLV_BHVR_SETSPHERE, // Gives an object exclusive control of the 'vision spheres' effect
RLV_BHVR_SETOVERLAY, // Gives an object exclusive control of the overlay
+ RLV_BHVR_SETOVERLAY_TOUCH, // Determines whether the overlay texture's alpha channel will be used to allow/block world interaction
RLV_BHVR_SETOVERLAY_TWEEN, // Animate between the current overlay settings and the supplied values
RLV_BHVR_COUNT,
@@ -290,7 +291,6 @@ enum class ERlvLocalBhvrModifier
OverlayAlpha, // Transparency level of the overlay texture (in addition to the texture's own alpha channel)
OverlayTexture, // Specifies the UUID of the overlay texture
OverlayTint, // The tint that's applied to the overlay texture
- OverlayTouch, // Determines whether the overlay texture's alpha channel will be used to allow/block world interaction
// @setsphere
SphereMode, // The type of effect that will apply to any pixel that intersects with the sphere (e.g. blend, blur, ...)
SphereOrigin, // The origin of the sphere can either be the avatar or the camera position
diff --git a/indra/newview/rlveffects.cpp b/indra/newview/rlveffects.cpp
index 70e90301444245b7d616395478b1318fc4dcdc45..b3ad464646864771d97fc1e961c88b2fe1c24c81 100644
--- a/indra/newview/rlveffects.cpp
+++ b/indra/newview/rlveffects.cpp
@@ -58,15 +58,6 @@ ERlvCmdRet RlvOverlayEffect::onAlphaValueChanged(const LLUUID& idRlvObj, const b
return RLV_RET_SUCCESS;
}
-// static
-ERlvCmdRet RlvOverlayEffect::onBlockTouchValueChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
-{
- if (RlvOverlayEffect* pEffect = LLVfxManager::instance().getEffect<RlvOverlayEffect>(idRlvObj))
- {
- pEffect->m_fBlockTouch = (newValue) ? boost::get<bool>(newValue.value()) : false;
- }
- return RLV_RET_SUCCESS;
-}
// static
ERlvCmdRet RlvOverlayEffect::onColorValueChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue)
{
diff --git a/indra/newview/rlveffects.h b/indra/newview/rlveffects.h
index 26256228299a783d952888de197bd63c6639cdc9..869239206d470b708f0c4f91b96e02c25c6f51c6 100644
--- a/indra/newview/rlveffects.h
+++ b/indra/newview/rlveffects.h
@@ -39,10 +39,10 @@ class RlvOverlayEffect final : public LLVisualEffect
public:
bool hitTest(const LLCoordGL& ptMouse) const;
void run(const LLVisualEffectParams*) override;
+ void setBlockTouch(bool block_touch) { m_fBlockTouch = block_touch; }
void tweenAlpha(float endAlpha, double duration) { m_nAlpha.start(endAlpha, duration); }
void tweenColor(LLColor3 endColor, double duration) { m_Color.start(endColor, duration); }
static ERlvCmdRet onAlphaValueChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue);
- static ERlvCmdRet onBlockTouchValueChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue);
static ERlvCmdRet onColorValueChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue);
static ERlvCmdRet onTextureChanged(const LLUUID& idRlvObj, const boost::optional<RlvBehaviourModifierValue> newValue);
protected:
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 6dc05f8f1ce7813e5230423712dce75d692128b0..22444466ca478fa0e40f49f7148d8012ab48226b 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -2090,7 +2090,7 @@ ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_SETOVERLAY>::onCommand(const RlvCommand&
}
// Refresh overlay effects according to object hierarchy
- std::list<LLVisualEffect*> effects;
+ std::list<RlvOverlayEffect*> effects;
if (LLVfxManager::instance().getEffects<RlvOverlayEffect>(effects))
{
auto itActiveEffect = std::find_if(effects.begin(), effects.end(), [](const LLVisualEffect* pEffect) { return pEffect->getEnabled(); });
@@ -2101,17 +2101,30 @@ ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_SETOVERLAY>::onCommand(const RlvCommand&
}
const LLUUID idActiveRootObj = (effects.end() != itActiveEffect) ? Rlv::getObjectRootId((*itActiveEffect)->getId()) : LLUUID::null;
- for (LLVisualEffect* pEffect : effects)
+ for (RlvOverlayEffect* pEffect : effects)
{
bool isActive = (idActiveRootObj.isNull() && pEffect == effects.front()) || (Rlv::getObjectRootId(pEffect->getId()) == idActiveRootObj);
int nPriority = (isActive) ? 256 - Rlv::getObjectLinkNumber(pEffect->getId()) : pEffect->getPriority();
LLVfxManager::instance().updateEffect(pEffect, isActive, nPriority);
+ pEffect->setBlockTouch(gRlvHandler.hasBehaviour(pEffect->getId(), RLV_BHVR_SETOVERLAY_TOUCH));
}
}
return eRet;
}
+// Handles: @setoverlay_touch=n
+template<> template<>
+ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_SETOVERLAY_TOUCH>::onCommand(const RlvCommand& rlvCmd, bool& fRefCount)
+{
+ if (RlvOverlayEffect* pOverlayEffect = LLVfxManager::instance().getEffect<RlvOverlayEffect>(rlvCmd.getObjectID()))
+ {
+ pOverlayEffect->setBlockTouch( RLV_TYPE_ADD == rlvCmd.getParamType() );
+ }
+
+ return RLV_RET_SUCCESS;
+}
+
// Handles: @setsphere=n|y
template<> template<>
ERlvCmdRet RlvBehaviourHandler<RLV_BHVR_SETSPHERE>::onCommand(const RlvCommand& rlvCmd, bool& fRefCount)
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 6f1e5819505aade063538c71847d56e4fb045845..bfb005808693090b6a45de668f657f39dda8e34a 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -228,8 +228,8 @@ RlvBehaviourDictionary::RlvBehaviourDictionary()
pSetOverlayBhvr->addModifier(ERlvLocalBhvrModifier::OverlayAlpha, typeid(float), "alpha", &RlvOverlayEffect::onAlphaValueChanged);
pSetOverlayBhvr->addModifier(ERlvLocalBhvrModifier::OverlayTexture, typeid(LLUUID), "texture", &RlvOverlayEffect::onTextureChanged);
pSetOverlayBhvr->addModifier(ERlvLocalBhvrModifier::OverlayTint, typeid(LLVector3), "tint", &RlvOverlayEffect::onColorValueChanged);
- pSetOverlayBhvr->addModifier(ERlvLocalBhvrModifier::OverlayTouch, typeid(LLVector3), "touch", &RlvOverlayEffect::onBlockTouchValueChanged);
addEntry(pSetOverlayBhvr);
+ addEntry(new RlvBehaviourProcessor<RLV_BHVR_SETOVERLAY_TOUCH>("setoverlay_touch"));
addEntry(new RlvForceProcessor<RLV_BHVR_SETOVERLAY_TWEEN>("setoverlay_tween"));
// Sphere