diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
| commit | abdc99f21b542c4fea67030ddbd7166c9d1c6c63 (patch) | |
| tree | 3e984e405adfdec189ca8a047daca5250737ffbf /indra/newview/lldrawable.h | |
| parent | 34412f0530cf6a411b4de906a8e9da59cbcb3a85 (diff) | |
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
Diffstat (limited to 'indra/newview/lldrawable.h')
| -rw-r--r-- | indra/newview/lldrawable.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 77715cbedf..f5a66a3a78 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -98,6 +98,7 @@ public: const LLVector3 getPositionAgent() const; const LLVector3d& getPositionGroup() const { return mPositionGroup; } const LLVector3& getScale() const { return mCurrentScale; } + void setScale(const LLVector3& scale) { mCurrentScale = scale; } const LLQuaternion& getWorldRotation() const { return mXform.getWorldRotation(); } const LLQuaternion& getRotation() const { return mXform.getRotation(); } F32 getIntensity() const { return llmin(mXform.getScale().mV[0], 4.f); } |