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/llviewercamera.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llviewercamera.h')
| -rw-r--r-- | indra/newview/llviewercamera.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewercamera.h b/indra/newview/llviewercamera.h index c4a0f7ea53..a16f25ff81 100644 --- a/indra/newview/llviewercamera.h +++ b/indra/newview/llviewercamera.h @@ -50,7 +50,7 @@ const F32 OGL_TO_CFR_ROTATION[16] = { 0.f, 0.f, -1.f, 0.f, // -Z becomes X const BOOL FOR_SELECTION = TRUE; const BOOL NOT_FOR_SELECTION = FALSE; -class LLViewerCamera : public LLCamera +class LLViewerCamera : public LLCamera, public LLSingleton<LLViewerCamera> { public: LLViewerCamera(); @@ -111,7 +111,6 @@ protected: public: }; -extern LLViewerCamera *gCamera; extern F64 gGLModelView[16]; extern F64 gGLLastModelView[16]; extern F64 gGLProjection[16]; |