summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-06-07 14:37:39 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-06-07 14:37:39 -0700
commitc78cd1aae63a7c7c0bf6a9c21380818aa9cd47b7 (patch)
tree4032bea3e86124cdf5bee13fd1ddcd886fd9336e /indra/llprimitive
parentaf0cc77199f22c223fcdfb8b46241fb6b81e8e27 (diff)
NORSPEC-233 WIP fix completely bogus substitution of offsets for scales and make scale accessors get with the program
Diffstat (limited to 'indra/llprimitive')
-rwxr-xr-xindra/llprimitive/lltextureentry.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
index 59364cb913..19edcaa27d 100755
--- a/indra/llprimitive/lltextureentry.h
+++ b/indra/llprimitive/lltextureentry.h
@@ -133,8 +133,8 @@ public:
virtual const LLUUID &getID() const { return mID; }
const LLColor4 &getColor() const { return mColor; }
void getScale(F32 *s, F32 *t) const { *s = mScaleS; *t = mScaleT; }
- void getScaleS(F32 *s) const { *s = mScaleS; }
- void getScaleT(F32 *t) const { *t = mScaleT; }
+ F32 getScaleS() const { return mScaleS; }
+ F32 getScaleT() const { return mScaleT; }
void getOffset(F32 *s, F32 *t) const { *s = mOffsetS; *t = mOffsetT; }
F32 getOffsetS() const { return mOffsetS; }