diff options
| -rwxr-xr-x | indra/newview/llfloaterbuyland.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llpersistentnotificationstorage.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llviewerkeyboard.cpp | 15 |
3 files changed, 11 insertions, 8 deletions
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp index da499f96d2..060c091737 100755 --- a/indra/newview/llfloaterbuyland.cpp +++ b/indra/newview/llfloaterbuyland.cpp @@ -934,7 +934,7 @@ void LLFloaterBuyLandUI::tellUserError( // virtual BOOL LLFloaterBuyLandUI::postBuild() { - setVisibleCallback(boost::bind(&LLFloaterBuyLandUI::onVisibilityChange, this, _2)); + setVisibleCallback(boost::bind(&LLFloaterBuyLandUI::onVisibilityChanged, this, _2)); mCurrency.prepare(); diff --git a/indra/newview/llpersistentnotificationstorage.cpp b/indra/newview/llpersistentnotificationstorage.cpp index ce4b2d543b..04f0efb44f 100755 --- a/indra/newview/llpersistentnotificationstorage.cpp +++ b/indra/newview/llpersistentnotificationstorage.cpp @@ -146,7 +146,7 @@ void LLPersistentNotificationStorage::loadNotifications() ++processed_notifications; if (processed_notifications >= gSavedSettings.getS32("MaxPersistentNotifications")) { - llwarns << "Too many persistent notifications." + LL_WARNS() << "Too many persistent notifications." << " Processed " << gSavedSettings.getS32("MaxPersistentNotifications") << " of " << data.size() << " persistent notifications." << LL_ENDL; break; } diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index b54486328b..160478788c 100755 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -146,9 +146,11 @@ void agent_push_forward( EKeystate s ) if (LLFloaterCamera::inFreeCameraMode()) { camera_move_forward(s); - return; } - agent_push_forwardbackward(s, 1, LLAgent::DOUBLETAP_FORWARD); + else + { + agent_push_forwardbackward(s, 1, LLAgent::DOUBLETAP_FORWARD); + } } void camera_move_backward( EKeystate s ); @@ -159,14 +161,15 @@ void agent_push_backward( EKeystate s ) if (LLFloaterCamera::inFreeCameraMode()) { camera_move_backward(s); - return; } - else if (gAgentAvatarp->isSitting()) + else if (!gAgent.backwardGrabbed() && gAgentAvatarp->isSitting()) { gAgentCamera.changeCameraToThirdPerson(); - return; } - agent_push_forwardbackward(s, -1, LLAgent::DOUBLETAP_BACKWARD); + else + { + agent_push_forwardbackward(s, -1, LLAgent::DOUBLETAP_BACKWARD); + } } static void agent_slide_leftright( EKeystate s, S32 direction, LLAgent::EDoubleTapRunMode mode ) |