diff options
| author | Richard Linden <none@none> | 2013-05-06 09:37:37 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-06 09:37:37 -0700 |
| commit | 71ec63a70a23f8be46ac22d57eb73fdcbae2aaa2 (patch) | |
| tree | d105dc62e378ceaf9ec463857d63fe31c8c5b715 /indra/newview/llviewercamera.cpp | |
| parent | 6b81b8629e67d82a7620e48781ded73b6e6126ea (diff) | |
| parent | dd07e240538ae8eaed07526396069dae82448576 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llviewercamera.cpp')
| -rw-r--r-- | indra/newview/llviewercamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp index 1f5bdc8589..45302ebb74 100644 --- a/indra/newview/llviewercamera.cpp +++ b/indra/newview/llviewercamera.cpp @@ -57,7 +57,7 @@ LLTrace::CountStatHandle<> LLViewerCamera::sVelocityStat("camera_velocity"); LLTrace::CountStatHandle<> LLViewerCamera::sAngularVelocityStat("camera_angular_velocity"); -U32 LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WORLD; +LLViewerCamera::eCameraID LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WORLD; //glu pick matrix implementation borrowed from Mesa3D glh::matrix4f gl_pick_matrix(GLfloat x, GLfloat y, GLfloat width, GLfloat height, GLint* viewport) |