summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercamera.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-24 10:22:20 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-24 10:22:20 +0100
commit8de8669f340179324f47668dbd9102ba4f8526bd (patch)
tree663f02ab3761092aec66682c139617f64a2407bc /indra/newview/llfloatercamera.cpp
parent528964429633b5f878216ba0ffa80c69abc70205 (diff)
parentb25d969b61eb1e4f114ee0e632d1de9777780e9f (diff)
merge from viewer-development
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
-rw-r--r--indra/newview/llfloatercamera.cpp2
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");