FIRE-18250: Added option to disable default eye movement

Fri, 06 May 2016 23:12:47 -0700

author
Kadah_Coba <kadah.coba@gmail.com>
date
Fri, 06 May 2016 23:12:47 -0700
changeset 48958
7de7ac1d8dc3
parent 48957
34ab2f0ccd16
child 48959
83ce67bea7ff

FIRE-18250: Added option to disable default eye movement

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/app_settings/settings_per_account.xml file | annotate | diff | revisions
indra/newview/llfloaterpreference.cpp file | annotate | diff | revisions
indra/newview/llfloaterpreference.h file | annotate | diff | revisions
indra/newview/llstartup.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Wed May 04 10:42:05 2016 +0200
     1.2 +++ b/indra/newview/app_settings/settings.xml	Fri May 06 23:12:47 2016 -0700
     1.3 @@ -23841,6 +23841,17 @@
     1.4        <key>Value</key>
     1.5        <integer>0</integer>
     1.6      </map>
     1.7 +    <key>FSStaticEyesUUID</key>
     1.8 +    <map>
     1.9 +      <key>Comment</key>
    1.10 +      <string>Animation UUID to used to stop idle eye moment (Default uses priority 2)</string>
    1.11 +      <key>Persist</key>
    1.12 +      <integer>1</integer>
    1.13 +      <key>Type</key>
    1.14 +      <string>String</string>
    1.15 +      <key>Value</key>
    1.16 +      <string>eff31dd2-1b65-5a03-5e37-15aca8e53ab7</string>
    1.17 +    </map>
    1.18    </map>
    1.19  </llsd>
    1.20  
     2.1 --- a/indra/newview/app_settings/settings_per_account.xml	Wed May 04 10:42:05 2016 +0200
     2.2 +++ b/indra/newview/app_settings/settings_per_account.xml	Fri May 06 23:12:47 2016 -0700
     2.3 @@ -1059,5 +1059,18 @@
     2.4          <key>Backup</key>
     2.5              <integer>0</integer>
     2.6          </map>
     2.7 +    <key>FSStaticEyes</key>
     2.8 +        <map>
     2.9 +        <key>Comment</key>
    2.10 +            <string>Status of crouch toggle.</string>
    2.11 +        <key>Persist</key>
    2.12 +            <integer>1</integer>
    2.13 +        <key>Type</key>
    2.14 +            <string>Boolean</string>
    2.15 +        <key>Value</key>
    2.16 +            <integer>0</integer>
    2.17 +        <key>Backup</key>
    2.18 +            <integer>0</integer>
    2.19 +        </map>
    2.20      </map>
    2.21  </llsd>
     3.1 --- a/indra/newview/llfloaterpreference.cpp	Wed May 04 10:42:05 2016 +0200
     3.2 +++ b/indra/newview/llfloaterpreference.cpp	Fri May 06 23:12:47 2016 -0700
     3.3 @@ -550,6 +550,9 @@
     3.4  
     3.5  	// <FS:Ansariel> FIRE-2912: Reset voice button
     3.6  	mCommitCallbackRegistrar.add("Pref.ResetVoice",						boost::bind(&LLFloaterPreference::onClickResetVoice, this));
     3.7 +	
     3.8 +	// <FS: KC> FIRE-18250: Option to disable default eye movement
     3.9 +	mCommitCallbackRegistrar.add("Pref.StaticEyes",						boost::bind(&LLFloaterPreference::onClickStaticEyes, this));
    3.10  	// </Firestorm callbacks>
    3.11  
    3.12  	mCommitCallbackRegistrar.add("UpdateFilter", boost::bind(&LLFloaterPreference::onUpdateFilterTerm, this, false)); // <FS:ND/> Hook up for filtering
    3.13 @@ -4416,6 +4419,23 @@
    3.14  }
    3.15  // </FS:Kadah>
    3.16  
    3.17 +// <FS:KC> FIRE-18250: Option to disable default eye movement
    3.18 +void LLFloaterPreference::onClickStaticEyes()
    3.19 +{
    3.20 +	LLUUID anim_id(gSavedSettings.getString("FSStaticEyesUUID"));
    3.21 +	if (gSavedPerAccountSettings.getBOOL("FSStaticEyes"))
    3.22 +	{
    3.23 +		gAgentAvatarp->startMotion(anim_id);
    3.24 +		gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_START);
    3.25 +	}
    3.26 +	else
    3.27 +	{
    3.28 +		gAgentAvatarp->stopMotion(anim_id);
    3.29 +		gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_STOP);
    3.30 +	}
    3.31 +}
    3.32 +// </FS:KC>
    3.33 +
    3.34  // <FS:AW optional opensim support>
    3.35  #ifdef OPENSIM
    3.36  static LLPanelInjector<LLPanelPreferenceOpensim> t_pref_opensim("panel_preference_opensim");
     4.1 --- a/indra/newview/llfloaterpreference.h	Wed May 04 10:42:05 2016 +0200
     4.2 +++ b/indra/newview/llfloaterpreference.h	Fri May 06 23:12:47 2016 -0700
     4.3 @@ -177,6 +177,9 @@
     4.4  	// <FS:Ansariel> FIRE-2912: Reset voice button
     4.5  	void onClickResetVoice();
     4.6  
     4.7 +	// <FS:KC> FIRE-18250: Option to disable default eye movement
     4.8 +	void onClickStaticEyes();
     4.9 +
    4.10  	void onClickSetCache();
    4.11  	void onClickBrowseCache();
    4.12  	void onClickBrowseCrashLogs();
     5.1 --- a/indra/newview/llstartup.cpp	Wed May 04 10:42:05 2016 +0200
     5.2 +++ b/indra/newview/llstartup.cpp	Fri May 06 23:12:47 2016 -0700
     5.3 @@ -2917,6 +2917,15 @@
     5.4  			LLHTTPClient::get(gSavedSettings.getString("AutoQueryGridStatusURL"), new SLGridStatusResponder());
     5.5  		}
     5.6  		// </FS:PP>
     5.7 +		
     5.8 +		// <FS:KC> FIRE-18250: Option to disable default eye movement
     5.9 +		if (gSavedPerAccountSettings.getBOOL("FSStaticEyes"))
    5.10 +		{
    5.11 +			LLUUID anim_id(gSavedSettings.getString("FSStaticEyesUUID"));
    5.12 +			gAgentAvatarp->startMotion(anim_id);
    5.13 +			gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_START);
    5.14 +		}
    5.15 +		// </FS:KC>
    5.16  
    5.17  		return TRUE;
    5.18  	}
     6.1 --- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml	Wed May 04 10:42:05 2016 +0200
     6.2 +++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml	Fri May 06 23:12:47 2016 -0700
     6.3 @@ -546,6 +546,21 @@
     6.4           width="500">
     6.5               (Avatar look at target settings are on the Privacy tab.)
     6.6          </text>
     6.7 +		
     6.8 +        <check_box
     6.9 +         top_pad="10"
    6.10 +         enabled="true"
    6.11 +         follows="left|top"
    6.12 +         height="16"
    6.13 +         initial_value="true"
    6.14 +         label="Disable random avatar eye moments"
    6.15 +         left="15"
    6.16 +         name="FSStaticEyes"
    6.17 +         width="250"
    6.18 +         control_name="FSStaticEyes">
    6.19 +			<check_box.commit_callback
    6.20 +			 function="Pref.StaticEyes" />
    6.21 +		</check_box>
    6.22  
    6.23          <!-- LGG Color Beams -->
    6.24          <text
    6.25 @@ -769,7 +784,7 @@
    6.26          <text
    6.27           type="string"
    6.28           left="5"
    6.29 -         top_pad="90"
    6.30 +         top_pad="65"
    6.31           length="1"
    6.32           follows="left|top"
    6.33           height="12"

mercurial