diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
| commit | faae38daaaf30fd96b217316cf3eafb095ff35bc (patch) | |
| tree | e73c2991dcfffa2c4d4260fff6102d65be1e1312 /indra/newview/llviewerwindow.h | |
| parent | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff) | |
| parent | e7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff) | |
Pull merge from lindenlab/viewer-developement
Diffstat (limited to 'indra/newview/llviewerwindow.h')
| -rw-r--r-- | indra/newview/llviewerwindow.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index 5a0d9652b8..b33488fd78 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -41,7 +41,6 @@ #include "llcursortypes.h" #include "llwindowcallbacks.h" #include "lltimer.h" -#include "llstat.h" #include "llmousehandler.h" #include "llnotifications.h" #include "llhandle.h" @@ -51,7 +50,7 @@ #include <boost/signals2.hpp> #include <boost/scoped_ptr.hpp> - +class LLStat; class LLView; class LLViewerObject; class LLUUID; @@ -252,7 +251,7 @@ public: S32 getCurrentMouseDX() const { return mCurrentMouseDelta.mX; } S32 getCurrentMouseDY() const { return mCurrentMouseDelta.mY; } LLCoordGL getCurrentMouseDelta() const { return mCurrentMouseDelta; } - LLStat * getMouseVelocityStat() { return &mMouseVelocityStat; } + LLStat* getMouseVelocityStat() { return mMouseVelocityStat; } BOOL getLeftMouseDown() const { return mLeftMouseDown; } BOOL getMiddleMouseDown() const { return mMiddleMouseDown; } BOOL getRightMouseDown() const { return mRightMouseDown; } @@ -433,7 +432,7 @@ private: LLCoordGL mCurrentMousePoint; // last mouse position in GL coords LLCoordGL mLastMousePoint; // Mouse point at last frame. LLCoordGL mCurrentMouseDelta; //amount mouse moved this frame - LLStat mMouseVelocityStat; + LLStat* mMouseVelocityStat; BOOL mLeftMouseDown; BOOL mMiddleMouseDown; BOOL mRightMouseDown; |