diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/lldrawable.h | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/newview/lldrawable.h')
-rw-r--r-- | linden/indra/newview/lldrawable.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/lldrawable.h b/linden/indra/newview/lldrawable.h index 15ad2e1..f5a66a3 100644 --- a/linden/indra/newview/lldrawable.h +++ b/linden/indra/newview/lldrawable.h | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -97,6 +98,7 @@ public: | |||
97 | const LLVector3 getPositionAgent() const; | 98 | const LLVector3 getPositionAgent() const; |
98 | const LLVector3d& getPositionGroup() const { return mPositionGroup; } | 99 | const LLVector3d& getPositionGroup() const { return mPositionGroup; } |
99 | const LLVector3& getScale() const { return mCurrentScale; } | 100 | const LLVector3& getScale() const { return mCurrentScale; } |
101 | void setScale(const LLVector3& scale) { mCurrentScale = scale; } | ||
100 | const LLQuaternion& getWorldRotation() const { return mXform.getWorldRotation(); } | 102 | const LLQuaternion& getWorldRotation() const { return mXform.getWorldRotation(); } |
101 | const LLQuaternion& getRotation() const { return mXform.getRotation(); } | 103 | const LLQuaternion& getRotation() const { return mXform.getRotation(); } |
102 | F32 getIntensity() const { return llmin(mXform.getScale().mV[0], 4.f); } | 104 | F32 getIntensity() const { return llmin(mXform.getScale().mV[0], 4.f); } |