diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/lltoolfocus.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/lltoolfocus.h')
| -rw-r--r-- | indra/newview/lltoolfocus.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h index ff2e6905f2..71df8078e6 100644 --- a/indra/newview/lltoolfocus.h +++ b/indra/newview/lltoolfocus.h @@ -35,7 +35,7 @@ #include "lltool.h" class LLToolCamera -: public LLTool +: public LLTool, public LLSingleton<LLToolCamera> { public: LLToolCamera(); @@ -75,8 +75,6 @@ protected: }; -extern LLToolCamera *gToolCamera; - extern BOOL gCameraBtnOrbit; extern BOOL gCameraBtnPan; |