diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llfloatercamera.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
| -rw-r--r-- | indra/newview/llfloatercamera.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index 75e1d694a4..47803d8304 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -61,10 +61,10 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val) S32 left = 16; const S32 ROTATE_WIDTH = 64; - mRotate = new LLJoystickCameraRotate("cam rotate stick", + mRotate = new LLJoystickCameraRotate(std::string("cam rotate stick"), LLRect( left, top, left + ROTATE_WIDTH, bottom ), - "cam_rotate_out.tga", - "cam_rotate_in.tga" ); + std::string("cam_rotate_out.tga"), + std::string("cam_rotate_in.tga") ); mRotate->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT); mRotate->setHeldDownDelay(CAMERA_BUTTON_DELAY); mRotate->setToolTip( getString("rotate_tooltip") ); @@ -75,11 +75,11 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val) const S32 ZOOM_WIDTH = 16; mZoom = new LLJoystickCameraZoom( - "zoom", + std::string("zoom"), LLRect( left, top, left + ZOOM_WIDTH, bottom ), - "cam_zoom_out.tga", - "cam_zoom_plus_in.tga", - "cam_zoom_minus_in.tga"); + std::string("cam_zoom_out.tga"), + std::string("cam_zoom_plus_in.tga"), + std::string("cam_zoom_minus_in.tga")); mZoom->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT); mZoom->setHeldDownDelay(CAMERA_BUTTON_DELAY); mZoom->setToolTip( getString("zoom_tooltip") ); @@ -89,10 +89,10 @@ LLFloaterCamera::LLFloaterCamera(const LLSD& val) left += ZOOM_WIDTH; const S32 TRACK_WIDTH = 64; - mTrack = new LLJoystickCameraTrack("cam track stick", + mTrack = new LLJoystickCameraTrack(std::string("cam track stick"), LLRect( left, top, left + TRACK_WIDTH, bottom ), - "cam_tracking_out.tga", - "cam_tracking_in.tga"); + std::string("cam_tracking_out.tga"), + std::string("cam_tracking_in.tga")); mTrack->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT); mTrack->setHeldDownDelay(CAMERA_BUTTON_DELAY); mTrack->setToolTip( getString("move_tooltip") ); |