diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 691d58dc3a393bb2bb4c00a48522f5f15f0be58f..4935ed855d6b2ed028a24fbf188cfffcf4265f1a 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1663,12 +1663,12 @@ void LLFloaterTools::updateMediaSettings() // Auto play //value_bool = default_media_data.getAutoPlay(); - // set default to auto play TRUE -- angela EXT-5172 - value_bool = true; + // set default to auto play TRUE -- angela EXT-5172 + value_bool = true; struct functor_getter_auto_play : public LLSelectedTEGetFunctor< bool > { - functor_getter_auto_play(const LLMediaEntry& entry) : mMediaEntry(entry) {} - + functor_getter_auto_play(const LLMediaEntry& entry) : mMediaEntry(entry) {} + bool get( LLViewerObject* object, S32 face ) { if ( object ) @@ -1676,11 +1676,11 @@ void LLFloaterTools::updateMediaSettings() if ( object->getTE(face)->getMediaData() ) return object->getTE(face)->getMediaData()->getAutoPlay(); //return mMediaEntry.getAutoPlay(); set default to auto play TRUE -- angela EXT-5172 - return true; + return true; }; - - const LLMediaEntry &mMediaEntry; - + + const LLMediaEntry &mMediaEntry; + } func_auto_play(default_media_data); identical = selected_objects->getSelectedTEValue( &func_auto_play, value_bool ); base_key = std::string( LLMediaEntry::AUTO_PLAY_KEY ); @@ -1689,12 +1689,12 @@ void LLFloaterTools::updateMediaSettings() // Auto scale - // set default to auto scale TRUE -- angela EXT-5172 + // set default to auto scale TRUE -- angela EXT-5172 //value_bool = default_media_data.getAutoScale(); - value_bool = true; + value_bool = true; struct functor_getter_auto_scale : public LLSelectedTEGetFunctor< bool > { - functor_getter_auto_scale(const LLMediaEntry& entry): mMediaEntry(entry) {} + functor_getter_auto_scale(const LLMediaEntry& entry): mMediaEntry(entry) {} bool get( LLViewerObject* object, S32 face ) { @@ -1702,12 +1702,12 @@ void LLFloaterTools::updateMediaSettings() if ( object->getTE(face) ) if ( object->getTE(face)->getMediaData() ) return object->getTE(face)->getMediaData()->getAutoScale(); - // return mMediaEntry.getAutoScale(); set default to auto scale TRUE -- angela EXT-5172 - return true; - }; - - const LLMediaEntry &mMediaEntry; - + // return mMediaEntry.getAutoScale(); set default to auto scale TRUE -- angela EXT-5172 + return true; + }; + + const LLMediaEntry &mMediaEntry; + } func_auto_scale(default_media_data); identical = selected_objects->getSelectedTEValue( &func_auto_scale, value_bool ); base_key = std::string( LLMediaEntry::AUTO_SCALE_KEY ); diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp index 86a11bdd82f427355e205ba0116a9bfadf6af664..0dcc44307f5fa8563130df28b089fc94c6d77c6d 100644 --- a/indra/newview/llviewerinput.cpp +++ b/indra/newview/llviewerinput.cpp @@ -697,11 +697,13 @@ bool run_forward(EKeystate s) else if(KEYSTATE_UP == s) { if (gAgent.mDoubleTapRunMode == LLAgent::DOUBLETAP_FORWARD) + { gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_NONE; + } // gAgent.clearRunning(); // gAgent.sendWalkRun(false); // [RLVa:KB] - Checked: 2011-05-11 (RLVa-1.3.0i) | Added: RLVa-1.3.0i - gAgent.clearTempRun(); + gAgent.clearTempRun(); // [/RLVa:KB] } agent_push_forward(s); @@ -728,11 +730,13 @@ bool run_backward(EKeystate s) else if (KEYSTATE_UP == s) { if (gAgent.mDoubleTapRunMode == LLAgent::DOUBLETAP_BACKWARD) + { gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_NONE; + } // gAgent.clearRunning(); // gAgent.sendWalkRun(false); // [RLVa:KB] - Checked: 2011-05-11 (RLVa-1.3.0i) | Added: RLVa-1.3.0i - gAgent.clearTempRun(); + gAgent.clearTempRun(); // [/RLVa:KB] } agent_push_backward(s); @@ -759,11 +763,13 @@ bool run_left(EKeystate s) else if (KEYSTATE_UP == s) { if (gAgent.mDoubleTapRunMode == LLAgent::DOUBLETAP_SLIDELEFT) + { gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_NONE; + } // gAgent.clearRunning(); // gAgent.sendWalkRun(false); // [RLVa:KB] - Checked: 2011-05-11 (RLVa-1.3.0i) | Added: RLVa-1.3.0i - gAgent.clearTempRun(); + gAgent.clearTempRun(); // [/RLVa:KB] } agent_slide_left(s); @@ -790,11 +796,13 @@ bool run_right(EKeystate s) else if (KEYSTATE_UP == s) { if (gAgent.mDoubleTapRunMode == LLAgent::DOUBLETAP_SLIDERIGHT) + { gAgent.mDoubleTapRunMode = LLAgent::DOUBLETAP_NONE; + } // gAgent.clearRunning(); // gAgent.sendWalkRun(false); // [RLVa:KB] - Checked: 2011-05-11 (RLVa-1.3.0i) | Added: RLVa-1.3.0i - gAgent.clearTempRun(); + gAgent.clearTempRun(); // [/RLVa:KB] } agent_slide_right(s);