summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercamera.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-06 13:35:54 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-06 13:35:54 -0800
commit9130cc471263dd982efb84136c8f79cc8e48f7e9 (patch)
treebe11bcefe3423fca99bc388e55878588ca9b501d /indra/newview/llfloatercamera.h
parent078278bf51b50ded63d5f7c4a9d99146f72aba69 (diff)
parent327069dcb8d71e2fb603c0ddf505d692de64e461 (diff)
Merge from viewer2 trunk again - some fairly important fixes there.
Diffstat (limited to 'indra/newview/llfloatercamera.h')
-rw-r--r--indra/newview/llfloatercamera.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index 5d44b4944d..45d5e9a845 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -61,7 +61,7 @@ public:
/* callback for camera presets changing */
static void onClickCameraPresets(const LLSD& param);
- static void toPrevModeIfInAvatarViewMode();
+ static void onLeavingMouseLook();
/** resets current camera mode to orbit mode */
static void resetCameraMode();
@@ -69,8 +69,6 @@ public:
/* determines actual mode and updates ui */
void update();
- static void updateIfNotInAvatarViewMode();
-
virtual void onOpen(const LLSD& key);
virtual void onClose(bool app_quitting);