diff options
author | Richard Linden <none@none> | 2013-04-12 14:27:25 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-04-12 14:27:25 -0700 |
commit | 1ddad3737977b9e750c4d1815ea99b51e75f18aa (patch) | |
tree | 140d51925a3cd2fbca3677ff293fc2d37b051759 /indra/newview/llviewercamera.h | |
parent | 54d7fc95893d1bf8cc3b6ebe94f3bf37f40125d0 (diff) | |
parent | 8db22a591645a3a7c3308827ca819bc2415692d8 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llviewercamera.h')
-rw-r--r-- | indra/newview/llviewercamera.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewercamera.h b/indra/newview/llviewercamera.h index ffec284f72..d7835d8567 100644 --- a/indra/newview/llviewercamera.h +++ b/indra/newview/llviewercamera.h @@ -100,7 +100,7 @@ public: BOOL projectPosAgentToScreen(const LLVector3 &pos_agent, LLCoordGL &out_point, const BOOL clamp = TRUE) const; BOOL projectPosAgentToScreenEdge(const LLVector3 &pos_agent, LLCoordGL &out_point) const; - const LLVector3* getVelocityDir() const {return &mVelocityDir;} + LLVector3 getVelocityDir() const {return mVelocityDir;} static LLTrace::CountStatHandle<>* getVelocityStat() {return &sVelocityStat; } static LLTrace::CountStatHandle<>* getAngularVelocityStat() {return &sAngularVelocityStat; } F32 getCosHalfFov() {return mCosHalfCameraFOV;} |