TPVP: set "Specify Viewer Type" in phoenix support chat rooms off by default

Tue, 28 Feb 2012 21:45:35 -0800

author
Tank_Master
date
Tue, 28 Feb 2012 21:45:35 -0800
changeset 1649
5cc7521aecc8
parent 1647
1a61bd48faae
child 1651
52ea74dbae8c

TPVP: set "Specify Viewer Type" in phoenix support chat rooms off by default

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/llimpanel.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Tue Feb 28 11:03:37 2012 -0800
     1.2 +++ b/indra/newview/app_settings/settings.xml	Tue Feb 28 21:45:35 2012 -0800
     1.3 @@ -10210,7 +10210,7 @@
     1.4  			<key>Value</key>
     1.5  			<integer>0</integer>
     1.6  		</map>
     1.7 -		<key>PhoenixSupportGroupchatPrefix</key>
     1.8 +		<key>PhoenixSupportGroupchatPrefix2</key>
     1.9  		<map>
    1.10  			<key>Comment</key>
    1.11  			<string>Prefixes "PH" to your chat in the Phoenix-Firestorm Viewer Support group, to insure you receive answers specific to Phoenix.</string>
    1.12 @@ -10219,7 +10219,7 @@
    1.13  			<key>Type</key>
    1.14  			<string>Boolean</string>
    1.15  			<key>Value</key>
    1.16 -			<integer>1</integer>
    1.17 +			<integer>0</integer>
    1.18  		</map>
    1.19  		<key>PhoenixTagColor</key>
    1.20  		<map>
     2.1 --- a/indra/newview/llimpanel.cpp	Tue Feb 28 11:03:37 2012 -0800
     2.2 +++ b/indra/newview/llimpanel.cpp	Tue Feb 28 21:45:35 2012 -0800
     2.3 @@ -1518,7 +1518,7 @@
     2.4  		childSetCommitCallback("prefixViewerToggle", onClickToggleViewerPrefix, this);
     2.5  		childSetVisible("prefixViewerToggle",TRUE);
     2.6  		childSetVisible("prefixViewerExtraText",TRUE);
     2.7 -		prefixViewer->setValue(gSavedSettings.getBOOL("PhoenixSupportGroupchatPrefix"));
     2.8 +		prefixViewer->setValue(gSavedSettings.getBOOL("PhoenixSupportGroupchatPrefix2"));
     2.9  	}
    2.10  }
    2.11  
    2.12 @@ -2091,7 +2091,7 @@
    2.13  {
    2.14  	LLFloaterIMPanel* self = (LLFloaterIMPanel*)data;
    2.15  	BOOL prefixViewer = self->getChild<LLCheckBoxCtrl>("prefixViewerToggle")->getValue();
    2.16 -	gSavedSettings.setBOOL("PhoenixSupportGroupchatPrefix",prefixViewer);
    2.17 +	gSavedSettings.setBOOL("PhoenixSupportGroupchatPrefix2",prefixViewer);
    2.18  }
    2.19  
    2.20  // static
    2.21 @@ -3086,7 +3086,7 @@
    2.22  			}
    2.23  			
    2.24  			// AO: PVFS Viewer Prefix
    2.25 -			static LLCachedControl<bool> chat_prefix(gSavedSettings, "PhoenixSupportGroupchatPrefix");
    2.26 +			static LLCachedControl<bool> chat_prefix(gSavedSettings, "PhoenixSupportGroupchatPrefix2");
    2.27  			if (mPFVS && chat_prefix)
    2.28  			{
    2.29  				std::string version("");

mercurial