diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llmoveview.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/llmoveview.h')
| -rw-r--r-- | indra/newview/llmoveview.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h index 8d7cdc881d..250315b9f2 100644 --- a/indra/newview/llmoveview.h +++ b/indra/newview/llmoveview.h @@ -44,18 +44,15 @@ class LLJoystickAgentSlide; // Classes // class LLFloaterMove -: public LLFloater, - public LLFloaterSingleton<LLFloaterMove> +: public LLFloater { - friend class LLUISingleton<LLFloaterMove, VisibilityPolicy<LLFloater> >; - -protected: + friend class LLFloaterReg; + +private: LLFloaterMove(const LLSD& key); ~LLFloaterMove() {} - public: - /*virtual*/ void onOpen(const LLSD& key); - /*virtual*/ void onClose(bool app_quitting); + /*virtual*/ BOOL postBuild(); static F32 getYawRate(F32 time); |