diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-21 15:20:41 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-21 15:20:41 -0500 |
| commit | d215cd5c244a5448668cb2173b1d95d0d6adf3ae (patch) | |
| tree | 1ca61d7f58f2cfd063167c235431cf3836416db4 /indra/newview/llmoveview.cpp | |
| parent | 37b04c150792bb3e53a5ba02c6631aa1d0f8686f (diff) | |
| parent | c72de2edf0a2f7590fd43d86c59e83afcf7e8bcf (diff) | |
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 22201aecb2..818e7e0db1 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -571,7 +571,7 @@ BOOL LLPanelStandStopFlying::postBuild() mStandButton->setVisible(FALSE); mStopFlyingButton = getChild<LLButton>("stop_fly_btn"); - mStopFlyingButton->setCommitCallback(boost::bind(&LLFloaterMove::setFlyingMode, FALSE)); + //mStopFlyingButton->setCommitCallback(boost::bind(&LLFloaterMove::setFlyingMode, FALSE)); mStopFlyingButton->setCommitCallback(boost::bind(&LLPanelStandStopFlying::onStopFlyingButtonClick, this)); mStopFlyingButton->setVisible(FALSE); |