diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-14 19:27:38 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-14 19:27:38 +0000 |
| commit | 133a7b5fe2bcaaec8389b209cb5bd774ebc2ab63 (patch) | |
| tree | d7a8f7846af7dc948d9e11c5a75dd830fb12465c /indra/newview/llmoveview.cpp | |
| parent | a1cde743e755d826c86aeb006d2027ad2e5c8ce3 (diff) | |
svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release
QAR-364 - merge of maint-ui-9
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 4963b42a62..eea729393c 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -39,11 +39,9 @@ // Viewer includes #include "llagent.h" #include "llviewercontrol.h" -#include "llfontgl.h" #include "llbutton.h" #include "llviewerwindow.h" #include "lljoystickbutton.h" -#include "llresmgr.h" #include "llvieweruictrlfactory.h" // @@ -54,8 +52,6 @@ const F32 MOVE_BUTTON_DELAY = 0.0f; const F32 YAW_NUDGE_RATE = 0.05f; // fraction of normal speed const F32 NUDGE_TIME = 0.25f; // in seconds -const char *MOVE_TITLE = ""; - // // Global statics // @@ -69,8 +65,7 @@ LLFloaterMove* LLFloaterMove::sInstance = NULL; // protected LLFloaterMove::LLFloaterMove() -: LLFloater("move floater", "FloaterMoveRect", MOVE_TITLE, FALSE, 100, 100, DRAG_ON_TOP, - MINIMIZE_NO) +: LLFloater("move floater") { setIsChrome(TRUE); gUICtrlFactory->buildFloater(this,"floater_moveview.xml"); @@ -105,9 +100,6 @@ LLFloaterMove::LLFloaterMove() mMoveDownButton->setHeldDownDelay(MOVE_BUTTON_DELAY); mMoveDownButton->setHeldDownCallback( moveDown ); - mFlyButton = LLUICtrlFactory::getButtonByName(this, "fly btn"); - childSetAction("fly btn",onFlyButtonClicked,NULL); - sInstance = this; } @@ -168,12 +160,6 @@ BOOL LLFloaterMove::visible(void*) return (sInstance != NULL); } -// protected static -void LLFloaterMove::onFlyButtonClicked(void *) -{ - gAgent.toggleFlying(); -} - // protected static F32 LLFloaterMove::getYawRate( F32 time ) |