diff options
author | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
commit | 1df1be10afd14fe80d491617e175f4586a78f71f (patch) | |
tree | 6e7a55591c2166ae732a7854f329e9bfd800546b /indra/newview/llmoveview.h | |
parent | 75e5441f2da7252749174db70719a78637bc4eeb (diff) | |
parent | b20307a683073c415804966ed5b363fb68879ee5 (diff) |
merge
Diffstat (limited to 'indra/newview/llmoveview.h')
-rw-r--r-- | indra/newview/llmoveview.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h index 06463f02af..dcca8308d9 100644 --- a/indra/newview/llmoveview.h +++ b/indra/newview/llmoveview.h @@ -86,13 +86,12 @@ private: void onWalkButtonClick(); void onRunButtonClick(); void onFlyButtonClick(); - void onStopFlyingButtonClick(); void initMovementMode(); void setMovementMode(const EMovementMode mode); void showFlyControls(bool bShow); void initModeTooltips(); void setModeTooltip(const EMovementMode mode); - void showQuickTips(const EMovementMode mode); + void setModeTitle(const EMovementMode mode); void initModeButtonMap(); void setModeButtonToggleState(const EMovementMode mode); void updateButtonsWithMovementMode(const EMovementMode newMode); @@ -108,7 +107,6 @@ public: LLButton* mMoveUpButton; LLButton* mMoveDownButton; private: - LLButton* mStopFlyingButton; LLPanel* mModeActionsPanel; typedef std::map<LLView*, std::string> control_tooltip_map_t; |