From 52f2e497f2a302c458a0ffc5d5155aec67d3ab70 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 24 Mar 2020 08:12:22 -0400
Subject: [PATCH] Return the rainbows!
---
indra/newview/app_settings/settings_alchemy.xml | 11 +++++++++++
indra/newview/llagent.cpp | 14 ++++++++++++--
indra/newview/llagent.h | 2 +-
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/indra/newview/app_settings/settings_alchemy.xml b/indra/newview/app_settings/settings_alchemy.xml
index 63d4535c470..37ff7e33720 100644
--- a/indra/newview/app_settings/settings_alchemy.xml
+++ b/indra/newview/app_settings/settings_alchemy.xml
@@ -200,6 +200,17 @@
<key>Value</key>
<string>/tp2cam</string>
</map>
+ <key>AlchemyRainbowEffects</key>
+ <map>
+ <key>Comment</key>
+ <string>Makes agent effects rainbows!</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>AlchemyRezUnderLandGroup</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index bd7e256f5b8..acb837c4ce5 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3307,9 +3307,19 @@ BOOL LLAgent::allowOperation(PermissionBit op,
return perm.allowOperationBy(op, agent_proxy, group_proxy);
}
-const LLColor4 &LLAgent::getEffectColor()
+const LLColor4 LLAgent::getEffectColor()
{
- return *mEffectColor;
+ LLColor4 effect_color = *mEffectColor;
+
+ //<alchemy> Rainbow Particle Effects
+ static LLCachedControl<bool> AlchemyRainbowEffects(gSavedSettings, "AlchemyRainbowEffects");
+ if(AlchemyRainbowEffects)
+ {
+ LLColor3 rainbow;
+ rainbow.setHSL(fmodf((F32)LLFrameTimer::getElapsedSeconds()/4.f, 1.f), 1.f, 0.5f);
+ effect_color.set(rainbow, 1.0f);
+ }
+ return effect_color;
}
void LLAgent::setEffectColor(const LLColor4 &color)
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index b2d61e7bbe2..8ec71cab046 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -857,7 +857,7 @@ class LLAgent : public LLOldEvents::LLObservable
// HUD
//--------------------------------------------------------------------
public:
- const LLColor4 &getEffectColor();
+ const LLColor4 getEffectColor();
void setEffectColor(const LLColor4 &color);
private:
LLUIColor * mEffectColor;
--
GitLab