SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values.

1 files changed, 14 insertions, 3 deletions

diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index bbe911f488..bf19a01d57 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -251,9 +251,20 @@ public:
 	void setSpotLightParams(LLVector3 params);
 
 	BOOL getIsLight() const;
-	LLColor3 getLightBaseColor() const; // not scaled by intensity
-	LLColor3 getLightColor() const; // scaled by intensity
-    LLColor3 getLightSRGBColor() const; // Used to get the (cached) light color in sRGB color space.  Also scaled by intensity.
+
+
+    // Get the light color in sRGB color space NOT scaled by intensity.
+	LLColor3 getLightBaseColor() const; 
+    
+    //same as getLightSRGBColor()
+    LLColor3 getLightColor() const { return getLightSRGBColor(); }
+
+    // Same as linearColor3(getLightSRGBColor)
+    LLColor3 getLightLinearColor() const;
+
+    // Get the light color in sRGB color space scaled by intensity.
+    LLColor3 getLightSRGBColor() const; 
+
 	LLUUID	getLightTextureID() const;
 	bool isLightSpotlight() const;
 	LLVector3 getSpotLightParams() const;