diff options
author | Richard Linden <none@none> | 2010-09-23 12:00:17 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-23 12:00:17 -0700 |
commit | fbcbfb88059b0d669592407205dd4167257a2395 (patch) | |
tree | 7855a06b2bf542262c1d50a602d67244d0df6b5e /indra/newview/llfloatercamera.cpp | |
parent | 18bd7dfae789ce0d6be3de3811d6d779fc4ec63e (diff) | |
parent | 904776288c7f7ebd945e563567aafbcab387d0b2 (diff) |
merge
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
-rw-r--r-- | indra/newview/llfloatercamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index d4067452b0..ad24c6534a 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -345,7 +345,7 @@ BOOL LLFloaterCamera::postBuild() setTitleVisible(TRUE); // restore title visibility after chrome applying mRotate = getChild<LLJoystickCameraRotate>(ORBIT); - mZoom = getChild<LLPanelCameraZoom>(ZOOM); + mZoom = findChild<LLPanelCameraZoom>(ZOOM); mTrack = getChild<LLJoystickCameraTrack>(PAN); assignButton2Mode(CAMERA_CTRL_MODE_MODES, "avatarview_btn"); |