Merge Firestorm LGPL

Fri, 26 Feb 2016 21:36:15 +0100

author
Ansariel
date
Fri, 26 Feb 2016 21:36:15 +0100
changeset 48901
58531e6fd11d
parent 48900
718971f529e5
parent 48711
9d71dc0a97f1
child 48902
7848c0344c05

Merge Firestorm LGPL

autobuild.xml file | annotate | diff | revisions
indra/cmake/Utils.cmake file | annotate | diff | revisions
indra/llprimitive/lldaeloader.cpp file | annotate | diff | revisions
indra/media_plugins/cef/media_plugin_cef.cpp file | annotate | diff | revisions
indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/app_settings/settings_per_account.xml file | annotate | diff | revisions
indra/newview/llagent.cpp file | annotate | diff | revisions
indra/newview/llappviewer.cpp file | annotate | diff | revisions
indra/newview/llpanelface.cpp file | annotate | diff | revisions
package_override_vc12.ini file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Fri Feb 26 21:35:16 2016 +0100
     1.2 +++ b/autobuild.xml	Fri Feb 26 21:36:15 2016 +0100
     1.3 @@ -265,9 +265,9 @@
     1.4              <key>archive</key>
     1.5              <map>
     1.6                <key>hash</key>
     1.7 -              <string>8f865b509bb5011caf3dd95a22a4589d</string>
     1.8 +              <string>ffcb753473c91c9b58c9115a4de231cc</string>
     1.9                <key>url</key>
    1.10 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/apr_3p-update-apr/rev/297252/arch/CYGWIN/installer/apr_suite-1.4.5.297252-windows-297252.tar.bz2</string>
    1.11 +              <string>http://downloads.phoenixviewer.com/apr_suite-1.4.5.201602231237-r100-windows-201602231237-r100.tar.bz2</string>
    1.12              </map>
    1.13              <key>name</key>
    1.14              <string>windows</string>
     2.1 --- a/indra/cmake/Utils.cmake	Fri Feb 26 21:35:16 2016 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,106 +0,0 @@
     2.4 -# -*- cmake -*-
     2.5 -#
     2.6 -# Miscellaneous utility macros
     2.7 -
     2.8 -include(VersionControl)
     2.9 -
    2.10 -macro(load_config_file _config_filename)
    2.11 -  # FIXME: should use this when we deprecate cmake 2.4.8 support
    2.12 -  #  file(STRINGS ${_config_filename} _config_file_lines 
    2.13 -  #       REGEX "[a-zA-Z_][a-zA-Z0-9_]*\s*=\s*[a-zA-Z0-9_- ]*")
    2.14 -  file(READ ${_config_filename} _config_file_contents)
    2.15 -  set (config_entry_re "[ ]*([a-zA-Z][a-zA-Z0-9_]*)[ ]*=([a-zA-Z0-9.]+)[ ]*")
    2.16 -
    2.17 -  # HACK: This is the easiest way to iterate over lines in a file with 2.4-8
    2.18 -  string(REGEX MATCHALL 
    2.19 -         ${config_entry_re}
    2.20 -         _all_config_values 
    2.21 -         ${_config_file_contents}
    2.22 -         )
    2.23 -  foreach(_config_value ${_all_config_values})
    2.24 -    # Extract the key (variable name) and value and assign to a cmake variable.
    2.25 -    string(REGEX REPLACE "${config_entry_re}" "\\1" _key "${_config_value}")
    2.26 -    string(REGEX REPLACE "${config_entry_re}" "\\2" _value "${_config_value}")
    2.27 -    set("${_key}" "${_value}")
    2.28 -  endforeach(_config_value)
    2.29 -endmacro(load_config_file _config_filename)
    2.30 -
    2.31 -# Loads data from indra/Version, and sets the following variables for both the
    2.32 -# server and viewer
    2.33 -# (VIEWER|SERVER)_VERSION
    2.34 -# (VIEWER|SERVER)_VERSION_MAJOR
    2.35 -# (VIEWER|SERVER)_VERSION_MINOR
    2.36 -# (VIEWER|SERVER)_VERSION_PATCH
    2.37 -# 
    2.38 -# And the build version
    2.39 -# VERSION_BUILD
    2.40 -macro(load_version_data)
    2.41 -  load_config_file(Version)
    2.42 -  vcs_get_revision(VERSION_BUILD)
    2.43 -
    2.44 -  if (SERVER)
    2.45 -    if (NOT "${VERSION_SERVER}")
    2.46 -      message(FATAL_ERROR "VERSION_SERVER not set in indra/Version")
    2.47 -    endif (NOT "${VERSION_SERVER}")
    2.48 -    split_version_parts(
    2.49 -      "${VERSION_SERVER}"
    2.50 -      VERSION_SERVER_MAJOR
    2.51 -      VERSION_SERVER_MINOR
    2.52 -      VERSION_SERVER_PATCH
    2.53 -      )
    2.54 -    # append the build number to the server version
    2.55 -    set(VERSION_SERVER "${VERSION_SERVER}.${VERSION_BUILD}")
    2.56 -    message(STATUS "Server version ${VERSION_SERVER}")
    2.57 -  endif (SERVER)
    2.58 -
    2.59 -  if (VIEWER)
    2.60 -	# We probably don't care enough to get a cmake warning about this. [Disc]
    2.61 -#    if (NOT ${VERSION_SERVER})
    2.62 -#      message(FATAL_ERROR "VERSION_SERVER not set in indra/Version")
    2.63 -#    endif (NOT ${VERSION_SERVER})
    2.64 -    split_version_parts(
    2.65 -      "${VERSION_VIEWER}"
    2.66 -      VERSION_VIEWER_MAJOR
    2.67 -      VERSION_VIEWER_MINOR
    2.68 -      VERSION_VIEWER_PATCH
    2.69 -      )
    2.70 -    # append the build number to the viewer version
    2.71 -    set(VERSION_VIEWER "${VERSION_VIEWER}.${VERSION_BUILD}")
    2.72 -    message(STATUS "Viewer version ${VERSION_VIEWER}")
    2.73 -  endif (VIEWER)
    2.74 -endmacro(load_version_data)
    2.75 -
    2.76 -# Split the version into major, minor and patch parts, and assign them to the
    2.77 -# variable names supplied to the macro.
    2.78 -macro(split_version_parts _version _major _minor _patch)
    2.79 -  set(INDRA_VERSION_RE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$")
    2.80 -  if (NOT "${_version}" MATCHES "${INDRA_VERSION_RE}")
    2.81 -    message(FATAL_ERROR "${_version} is not a valid version string. It should be a 3 part version, MAJOR.MINOR.PATCH. Example: 2.1.49")
    2.82 -  endif (NOT "${_version}" MATCHES "${INDRA_VERSION_RE}")
    2.83 -  string(REGEX REPLACE "${INDRA_VERSION_RE}" "\\1" ${_major} "${_version}")
    2.84 -  string(REGEX REPLACE "${INDRA_VERSION_RE}" "\\2" ${_minor} "${_version}")
    2.85 -  string(REGEX REPLACE "${INDRA_VERSION_RE}" "\\3" ${_patch} "${_version}")
    2.86 -endmacro(split_version_parts)
    2.87 -
    2.88 -# configure_files - macro to simplify calling configure_file on source files
    2.89 -#
    2.90 -# arguments:
    2.91 -#   GENERATED FILES - variable to hold a list of generated files
    2.92 -#   FILES           - names of files to be configured.
    2.93 -macro(configure_files GENERATED_FILES)
    2.94 -  set(_files_to_add "")
    2.95 -  foreach (_template_file ${ARGV})
    2.96 -    if (NOT "${GENERATED_FILES}" STREQUAL "${_template_file}")
    2.97 -      configure_file(
    2.98 -        ${CMAKE_CURRENT_SOURCE_DIR}/${_template_file}.in
    2.99 -        ${CMAKE_CURRENT_SOURCE_DIR}/${_template_file}
   2.100 -        @ONLY
   2.101 -        )
   2.102 -      set(_files_to_add 
   2.103 -          ${_files_to_add} 
   2.104 -          ${CMAKE_CURRENT_SOURCE_DIR}/${_template_file}
   2.105 -          )
   2.106 -    endif (NOT "${GENERATED_FILES}" STREQUAL "${_template_file}")
   2.107 -  endforeach(_template_file)
   2.108 -  set(${GENERATED_FILES} ${_files_to_add})
   2.109 -endmacro(configure_files)
     3.1 --- a/indra/media_plugins/cef/media_plugin_cef.cpp	Fri Feb 26 21:35:16 2016 +0100
     3.2 +++ b/indra/media_plugins/cef/media_plugin_cef.cpp	Fri Feb 26 21:36:15 2016 +0100
     3.3 @@ -894,6 +894,9 @@
     3.4  		native_scan_code = (uint32_t)(native_key_data["sdl_sym"].asInteger());
     3.5  		native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());
     3.6  		native_modifiers = (uint32_t)(native_key_data["cef_modifiers"].asInteger());
     3.7 +
     3.8 +		if( native_scan_code == '\n' )
     3.9 +			native_scan_code = '\r';
    3.10  #endif
    3.11  	};
    3.12  };
     4.1 --- a/indra/newview/VIEWER_VERSION.txt	Fri Feb 26 21:35:16 2016 +0100
     4.2 +++ b/indra/newview/VIEWER_VERSION.txt	Fri Feb 26 21:36:15 2016 +0100
     4.3 @@ -1,1 +1,1 @@
     4.4 -4.7.6
     4.5 +4.7.8
     5.1 --- a/indra/newview/app_settings/settings.xml	Fri Feb 26 21:35:16 2016 +0100
     5.2 +++ b/indra/newview/app_settings/settings.xml	Fri Feb 26 21:36:15 2016 +0100
     5.3 @@ -21183,30 +21183,6 @@
     5.4        <key>Value</key>
     5.5        <integer>0</integer>
     5.6      </map>
     5.7 -    <key>FSCrouchToggle</key>
     5.8 -    <map>
     5.9 -      <key>Comment</key>
    5.10 -      <string>Enables using the crouch key as a toggle.</string>
    5.11 -      <key>Persist</key>
    5.12 -      <integer>1</integer>
    5.13 -      <key>Type</key>
    5.14 -      <string>Boolean</string>
    5.15 -      <key>Value</key>
    5.16 -      <integer>0</integer>
    5.17 -    </map>
    5.18 -    <key>FSCrouchToggleStatus</key>
    5.19 -    <map>
    5.20 -      <key>Comment</key>
    5.21 -      <string>Status of crouch toggle.</string>
    5.22 -      <key>Persist</key>
    5.23 -      <integer>1</integer>
    5.24 -      <key>Type</key>
    5.25 -      <string>Boolean</string>
    5.26 -      <key>Value</key>
    5.27 -      <integer>0</integer>
    5.28 -      <key>Backup</key>
    5.29 -      <integer>0</integer>
    5.30 -    </map>
    5.31      <key>FSPlayCollisionSounds</key>
    5.32      <map>
    5.33        <key>Comment</key>
     6.1 --- a/indra/newview/app_settings/settings_per_account.xml	Fri Feb 26 21:35:16 2016 +0100
     6.2 +++ b/indra/newview/app_settings/settings_per_account.xml	Fri Feb 26 21:36:15 2016 +0100
     6.3 @@ -1035,5 +1035,29 @@
     6.4          <key>Value</key>
     6.5             <integer>0</integer>
     6.6          </map>
     6.7 +    <key>FSCrouchToggle</key>
     6.8 +        <map>
     6.9 +        <key>Comment</key>
    6.10 +            <string>Enables using the crouch key as a toggle.</string>
    6.11 +        <key>Persist</key>
    6.12 +            <integer>1</integer>
    6.13 +        <key>Type</key>
    6.14 +            <string>Boolean</string>
    6.15 +        <key>Value</key>
    6.16 +            <integer>0</integer>
    6.17 +        </map>
    6.18 +    <key>FSCrouchToggleStatus</key>
    6.19 +        <map>
    6.20 +        <key>Comment</key>
    6.21 +            <string>Status of crouch toggle.</string>
    6.22 +        <key>Persist</key>
    6.23 +            <integer>1</integer>
    6.24 +        <key>Type</key>
    6.25 +            <string>Boolean</string>
    6.26 +        <key>Value</key>
    6.27 +            <integer>0</integer>
    6.28 +        <key>Backup</key>
    6.29 +            <integer>0</integer>
    6.30 +        </map>
    6.31      </map>
    6.32  </llsd>
     7.1 --- a/indra/newview/fsdata.h	Fri Feb 26 21:35:16 2016 +0100
     7.2 +++ b/indra/newview/fsdata.h	Fri Feb 26 21:36:15 2016 +0100
     7.3 @@ -47,13 +47,14 @@
     7.4  	
     7.5  	enum flags_t
     7.6  	{
     7.7 -		SUPPORT		= (1 << 0), //0x01
     7.8 -		DEVELOPER	= (1 << 1), //0x02
     7.9 -		QA			= (1 << 2), //0x04
    7.10 -		CHAT_COLOR	= (1 << 3), //0x08
    7.11 -		NO_SUPPORT	= (1 << 4), //0x16
    7.12 -		NO_USE		= (1 << 5), //0x32
    7.13 -		NO_SPAM		= (1 << 6)  //0x64
    7.14 +		SUPPORT		= (1 << 0), //0x01 1
    7.15 +		DEVELOPER	= (1 << 1), //0x02 2
    7.16 +		QA		= (1 << 2), //0x04 4
    7.17 +		CHAT_COLOR	= (1 << 3), //0x08 8
    7.18 +		NO_SUPPORT	= (1 << 4), //0x10 16
    7.19 +		NO_USE		= (1 << 5), //0x20 32
    7.20 +		NO_SPAM		= (1 << 6),  //0x40 64
    7.21 +		GATEWAY		= (1 << 7),	//0x80 128 <FS:JL>
    7.22  	};
    7.23  
    7.24  	std::set<LLUUID> mSupportGroup;
     8.1 --- a/indra/newview/fspanelprofile.cpp	Fri Feb 26 21:35:16 2016 +0100
     8.2 +++ b/indra/newview/fspanelprofile.cpp	Fri Feb 26 21:36:15 2016 +0100
     8.3 @@ -494,6 +494,7 @@
     8.4  	args["[FSSUPP]"] = "";
     8.5  	args["[FSDEV]"] = "";
     8.6  	args["[FSQA]"] = "";
     8.7 +	args["[FSGW]"] = "";
     8.8  	S32 flags = FSData::getInstance()->getAgentFlags(avatar_data->avatar_id);
     8.9  	if (flags != -1)
    8.10  	{
    8.11 @@ -530,6 +531,17 @@
    8.12  				text = " /" + text;
    8.13  			}
    8.14  			args["[FSQA]"] = text;
    8.15 +			separator = true;
    8.16 +		}
    8.17 +
    8.18 +		if (flags & FSData::GATEWAY)
    8.19 +		{
    8.20 +			text = getString("FSGW");
    8.21 +			if (separator)
    8.22 +			{
    8.23 +				text = " /" + text;
    8.24 +			}
    8.25 +			args["[FSGW]"] = text;
    8.26  		}
    8.27  	}
    8.28  
     9.1 --- a/indra/newview/llagent.cpp	Fri Feb 26 21:35:16 2016 +0100
     9.2 +++ b/indra/newview/llagent.cpp	Fri Feb 26 21:36:15 2016 +0100
     9.3 @@ -744,7 +744,7 @@
     9.4  	{
     9.5  		setControlFlags(AGENT_CONTROL_UP_NEG | AGENT_CONTROL_FAST_UP);
     9.6  		// <FS:Ansariel> Chalice Yao's crouch toggle
     9.7 -		if (!gSavedSettings.getBOOL("FSCrouchToggleStatus") || !gSavedSettings.getBOOL("FSCrouchToggle"))
     9.8 +		if (!gSavedPerAccountSettings.getBOOL("FSCrouchToggleStatus") || !gSavedPerAccountSettings.getBOOL("FSCrouchToggle"))
     9.9  		{
    9.10  			gAgentCamera.resetView(TRUE, FALSE, TRUE);
    9.11  		}
    9.12 @@ -907,9 +907,9 @@
    9.13  	}
    9.14  
    9.15  	// <FS:Ansariel> Chalice Yao's crouch toggle
    9.16 -	if (gSavedSettings.getBOOL("FSCrouchToggleStatus"))
    9.17 -	{
    9.18 -		gSavedSettings.setBOOL("FSCrouchToggleStatus", FALSE);
    9.19 +	if (gSavedPerAccountSettings.getBOOL("FSCrouchToggleStatus"))
    9.20 +	{
    9.21 +		gSavedPerAccountSettings.setBOOL("FSCrouchToggleStatus", FALSE);
    9.22  	}
    9.23  	// </FS:Ansariel>
    9.24  
    10.1 --- a/indra/newview/llappviewer.cpp	Fri Feb 26 21:35:16 2016 +0100
    10.2 +++ b/indra/newview/llappviewer.cpp	Fri Feb 26 21:36:15 2016 +0100
    10.3 @@ -1667,8 +1667,8 @@
    10.4  					joystick->scanJoystick();
    10.5  					gKeyboard->scanKeyboard();
    10.6  					// <FS:Ansariel> Chalice Yao's crouch toggle
    10.7 -					static LLCachedControl<bool> fsCrouchToggle(gSavedSettings, "FSCrouchToggle");
    10.8 -					static LLCachedControl<bool> fsCrouchToggleStatus(gSavedSettings, "FSCrouchToggleStatus");
    10.9 +					static LLCachedControl<bool> fsCrouchToggle(gSavedPerAccountSettings, "FSCrouchToggle");
   10.10 +					static LLCachedControl<bool> fsCrouchToggleStatus(gSavedPerAccountSettings, "FSCrouchToggleStatus");
   10.11  					if (fsCrouchToggle && fsCrouchToggleStatus)
   10.12  					{
   10.13  						gAgent.moveUp(-1);
    11.1 --- a/indra/newview/llpanelface.cpp	Fri Feb 26 21:35:16 2016 +0100
    11.2 +++ b/indra/newview/llpanelface.cpp	Fri Feb 26 21:36:15 2016 +0100
    11.3 @@ -2683,13 +2683,13 @@
    11.4  	LLPanelFace* self = dynamic_cast<LLPanelFace*>(ctrl->getParent());
    11.5  	llassert_always(self);
    11.6  	
    11.7 -	LLComboBox* combo_mattype = self->getChild<LLComboBox>("combobox mattype");
    11.8 -	if (!combo_mattype) return;
    11.9 +	LLRadioGroup* radio_mattype = self->findChild<LLRadioGroup>("radio_material_type");
   11.10 +	if (!radio_mattype) return;
   11.11  	
   11.12  	std::string user_data_string = user_data.asString();
   11.13  	if (user_data_string.empty()) return;
   11.14  	std::string control_name = "";
   11.15 -	U32 mattype = combo_mattype->getCurrentIndex();
   11.16 +	U32 mattype = radio_mattype->getSelectedIndex();
   11.17  	switch (mattype)
   11.18  	{
   11.19  		case MATTYPE_DIFFUSE:
   11.20 @@ -2706,13 +2706,13 @@
   11.21  			return;
   11.22  	}
   11.23  	
   11.24 -	LLUICtrl* spinner = self->getChild<LLUICtrl>(control_name);
   11.25 +	LLUICtrl* spinner = self->findChild<LLUICtrl>(control_name);
   11.26  	if (spinner)
   11.27  	{
   11.28  		F32 value = -(spinner->getValue().asReal());
   11.29  		spinner->setValue(value);
   11.30  		
   11.31 -		switch (combo_mattype->getCurrentIndex())
   11.32 +		switch (radio_mattype->getSelectedIndex())
   11.33  		{
   11.34  			case MATTYPE_DIFFUSE:
   11.35  				self->sendTextureInfo();
    12.1 --- a/indra/newview/llviewerkeyboard.cpp	Fri Feb 26 21:35:16 2016 +0100
    12.2 +++ b/indra/newview/llviewerkeyboard.cpp	Fri Feb 26 21:36:15 2016 +0100
    12.3 @@ -76,9 +76,9 @@
    12.4  	S32 frame_count = ll_round(gKeyboard->getCurKeyElapsedFrameCount());
    12.5  
    12.6  	// <FS:Ansariel> Chalice Yao's crouch toggle
    12.7 -	if (gSavedSettings.getBOOL("FSCrouchToggleStatus"))
    12.8 +	if (gSavedPerAccountSettings.getBOOL("FSCrouchToggleStatus"))
    12.9  	{
   12.10 -		gSavedSettings.setBOOL("FSCrouchToggleStatus", FALSE);
   12.11 +		gSavedPerAccountSettings.setBOOL("FSCrouchToggleStatus", FALSE);
   12.12  	}
   12.13  	// </FS:Ansariel>
   12.14  
   12.15 @@ -101,15 +101,15 @@
   12.16  	if( KEYSTATE_UP == s  ) return;
   12.17  	// <FS:Ansariel> Chalice Yao's crouch toggle
   12.18  	//gAgent.moveUp(-1);
   12.19 -	else if (KEYSTATE_DOWN == s && !gAgent.getFlying() && !gAgentAvatarp->isSitting() && gSavedSettings.getBOOL("FSCrouchToggle"))
   12.20 +	else if (KEYSTATE_DOWN == s && !gAgent.getFlying() && !gAgentAvatarp->isSitting() && gSavedPerAccountSettings.getBOOL("FSCrouchToggle"))
   12.21  	{
   12.22 -		if (gSavedSettings.getBOOL("FSCrouchToggleStatus"))
   12.23 +		if (gSavedPerAccountSettings.getBOOL("FSCrouchToggleStatus"))
   12.24  		{
   12.25 -			gSavedSettings.setBOOL("FSCrouchToggleStatus", FALSE);
   12.26 +			gSavedPerAccountSettings.setBOOL("FSCrouchToggleStatus", FALSE);
   12.27  		}
   12.28  		else
   12.29  		{
   12.30 -			gSavedSettings.setBOOL("FSCrouchToggleStatus", TRUE);
   12.31 +			gSavedPerAccountSettings.setBOOL("FSCrouchToggleStatus", TRUE);
   12.32  			gAgent.moveUp(-1);
   12.33  		}
   12.34  	}
    13.1 --- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    13.2 +++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    13.3 @@ -2,7 +2,7 @@
    13.4  <panel label="Redigér profil" name="edit_profile_panel">
    13.5  	<string name="CaptionTextAcctInfo">
    13.6  		[ACCTTYPE]
    13.7 -[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    13.8 +[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    13.9      </string>
   13.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   13.11      sending the latter any more. ...TS -->
    14.1 --- a/indra/newview/skins/default/xui/de/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    14.2 +++ b/indra/newview/skins/default/xui/de/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    14.3 @@ -2,7 +2,7 @@
    14.4  <panel label="Profil bearbeiten" name="edit_profile_panel">
    14.5  	<string name="CaptionTextAcctInfo">
    14.6  		[ACCTTYPE]
    14.7 -[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    14.8 +[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    14.9      </string>
   14.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   14.11      sending the latter any more. ...TS -->
    15.1 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    15.2 +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    15.3 @@ -20,7 +20,7 @@
    15.4     <string
    15.5      name="CaptionTextAcctInfo">
    15.6         [ACCTTYPE]
    15.7 -[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    15.8 +[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    15.9      </string>
   15.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   15.11      sending the latter any more. ...TS -->
   15.12 @@ -33,6 +33,9 @@
   15.13      <string
   15.14        name="FSQualityAssurance"
   15.15        value=" Bug Hunter" />
   15.16 +    <string
   15.17 +     name="FSGW"
   15.18 +     value=" Gateway" />
   15.19     <string
   15.20      name="RegisterDateFormat">
   15.21  	[REG_DATE] ([AGE])
    16.1 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:35:16 2016 +0100
    16.2 +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:36:15 2016 +0100
    16.3 @@ -20,7 +20,7 @@
    16.4       name="CaptionTextAcctInfo">
    16.5  [ACCTTYPE]
    16.6  [PAYMENTINFO]
    16.7 -[FIRESTORM][FSDEV][FSSUPP][FSQA]
    16.8 +[FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    16.9      </string>
   16.10      <!-- [AGEVERIFICATION] moved out of the above, since it's not set anyway. See
   16.11      LLPanelAvatarProfile::fillAccountStatus() ...TS -->
   16.12 @@ -63,6 +63,9 @@
   16.13      <string
   16.14        name="FSQualityAssurance"
   16.15        value=" Bug Hunter" />
   16.16 +    <string
   16.17 +     name="FSGW"
   16.18 +     value=" Gateway" />
   16.19  
   16.20  <!--
   16.21  
    17.1 --- a/indra/newview/skins/default/xui/es/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    17.2 +++ b/indra/newview/skins/default/xui/es/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    17.3 @@ -1,11 +1,12 @@
    17.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    17.5  <panel label="Editar mi perfil" name="edit_profile_panel">
    17.6  	<string name="CaptionTextAcctInfo">
    17.7 -		[ACCTTYPE] [PAYMENTINFO] [FSDEV][FSSUPP][FSQA][FIRESTORM]
    17.8 +		[ACCTTYPE] [PAYMENTINFO] [FSDEV][FSSUPP][FSQA][FSGW][FIRESTORM]
    17.9  	</string>
   17.10  	<string name="FSDev" value="Desarrollador "/>
   17.11  	<string name="FSSupp" value="Soporte " />
   17.12  	<string name="FSQualityAssurance" value="Bug Hunter " />
   17.13 +	<string name="FSGW" value="Gateway "/>
   17.14  	<string name="RegisterDateFormat">
   17.15  		[REG_DATE] ([AGE])
   17.16  	</string>
    18.1 --- a/indra/newview/skins/default/xui/es/panel_profile_secondlife.xml	Fri Feb 26 21:35:16 2016 +0100
    18.2 +++ b/indra/newview/skins/default/xui/es/panel_profile_secondlife.xml	Fri Feb 26 21:36:15 2016 +0100
    18.3 @@ -9,7 +9,7 @@
    18.4  	<string name="CaptionTextAcctInfo">
    18.5  		[ACCTTYPE]
    18.6  [PAYMENTINFO]
    18.7 -[FSDEV][FSSUPP][FSQA][FIRESTORM]
    18.8 +[FSDEV][FSSUPP][FSQA][FSGW][FIRESTORM]
    18.9  	</string>
   18.10  	<string name="payment_update_link_url">
   18.11  		http://www.secondlife.com/account/billing.php?lang=es
   18.12 @@ -23,6 +23,7 @@
   18.13  	<string name="FSDev" value="Desarrollador/a "/>
   18.14  	<string name="FSSupp" value="Soporte "/>
   18.15  	<string name="FSQualityAssurance" value="Bug Hunter "/>
   18.16 +	<string name="FSGW" value="Gateway "/>
   18.17  	<text name="Name:" value="Nombre:" width="50"/>
   18.18  	<view_border right="-126" name="info_border"/>
   18.19  	<text_editor name="complete_name" value="(cargando...)" right="-126"/>
    19.1 --- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    19.2 +++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    19.3 @@ -2,7 +2,7 @@
    19.4  <panel label="Modification du profil" name="edit_profile_panel">
    19.5  	<string name="CaptionTextAcctInfo">
    19.6          [ACCTTYPE]
    19.7 - [PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    19.8 + [PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    19.9  	</string>
   19.10  	<string name="RegisterDateFormat">[REG_DATE] ([AGE])</string>
   19.11  	<tab_container name="profile_accordion">
    20.1 --- a/indra/newview/skins/default/xui/it/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    20.2 +++ b/indra/newview/skins/default/xui/it/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    20.3 @@ -1,7 +1,7 @@
    20.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    20.5  <panel label="Modifica profilo" name="edit_profile_panel">
    20.6  	<string name="CaptionTextAcctInfo">
    20.7 -		[ACCTTYPE] [PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    20.8 +		[ACCTTYPE] [PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    20.9      </string>
   20.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   20.11      sending the latter any more. ...TS -->
    21.1 --- a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    21.2 +++ b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    21.3 @@ -2,7 +2,7 @@
    21.4  <panel label="プロフィールの編集" name="edit_profile_panel">
    21.5  	<string name="CaptionTextAcctInfo">
    21.6  		[ACCTTYPE]
    21.7 -[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    21.8 +[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    21.9      </string>
   21.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   21.11      sending the latter any more. ...TS -->
    22.1 --- a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml	Fri Feb 26 21:35:16 2016 +0100
    22.2 +++ b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml	Fri Feb 26 21:36:15 2016 +0100
    22.3 @@ -9,7 +9,7 @@
    22.4      <string name="CaptionTextAcctInfo">
    22.5  		[ACCTTYPE]
    22.6  		[PAYMENTINFO]
    22.7 -		[FIRESTORM][FSDEV][FSSUPP][FSQA]
    22.8 +		[FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    22.9      </string>
   22.10      <!-- [AGEVERIFICATION] moved out of the above, since it's not set anyway. See
   22.11      LLPanelAvatarProfile::fillAccountStatus() ...TS -->
    23.1 --- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    23.2 +++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    23.3 @@ -1,7 +1,7 @@
    23.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    23.5  <panel label="Editar perfil" name="edit_profile_panel">
    23.6  	<string name="CaptionTextAcctInfo">
    23.7 -		[ACCTTYPE] [PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    23.8 +		[ACCTTYPE] [PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    23.9      </string>
   23.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   23.11      sending the latter any more. ...TS -->
    24.1 --- a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    24.2 +++ b/indra/newview/skins/default/xui/ru/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    24.3 @@ -2,7 +2,7 @@
    24.4  <panel label="Редактирование профиля" name="edit_profile_panel">
    24.5  	<string name="CaptionTextAcctInfo">
    24.6  		[ACCTTYPE]
    24.7 -[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    24.8 +[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    24.9      </string>
   24.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   24.11      sending the latter any more. ...TS -->
    25.1 --- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    25.2 +++ b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    25.3 @@ -2,7 +2,7 @@
    25.4  <panel label="檔案編輯" name="edit_profile_panel">
    25.5  	<string name="CaptionTextAcctInfo">
    25.6  		[ACCTTYPE]
    25.7 -[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    25.8 +[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    25.9      </string>
   25.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   25.11      sending the latter any more. ...TS -->
    26.1 --- a/indra/newview/skins/latency/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:35:16 2016 +0100
    26.2 +++ b/indra/newview/skins/latency/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:36:15 2016 +0100
    26.3 @@ -20,7 +20,7 @@
    26.4       name="CaptionTextAcctInfo">
    26.5  [ACCTTYPE]
    26.6  [PAYMENTINFO]
    26.7 -[FIRESTORM][FSDEV][FSSUPP][FSQA]
    26.8 +[FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    26.9      </string>
   26.10      <!-- [AGEVERIFICATION] moved out of the above, since it's not set anyway. See
   26.11      LLPanelAvatarProfile::fillAccountStatus() ...TS -->
   26.12 @@ -62,6 +62,9 @@
   26.13      <string
   26.14        name="FSQualityAssurance"
   26.15        value=" Bug Hunter" />
   26.16 +    <string
   26.17 +     name="FSGW"
   26.18 +     value=" Gateway" />
   26.19  
   26.20  <!--
   26.21  
    27.1 --- a/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:35:16 2016 +0100
    27.2 +++ b/indra/newview/skins/metaharper/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:36:15 2016 +0100
    27.3 @@ -20,7 +20,7 @@
    27.4       name="CaptionTextAcctInfo">
    27.5  [ACCTTYPE]
    27.6  [PAYMENTINFO]
    27.7 -[FIRESTORM][FSDEV][FSSUPP][FSQA]
    27.8 +[FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    27.9      </string>
   27.10      <!-- [AGEVERIFICATION] moved out of the above, since it's not set anyway. See
   27.11      LLPanelAvatarProfile::fillAccountStatus() ...TS -->
   27.12 @@ -63,6 +63,9 @@
   27.13      <string
   27.14       name="FSQualityAssurance"
   27.15       value=" Bug Hunter" />
   27.16 +    <string
   27.17 +     name="FSGW"
   27.18 +     value=" Gateway" />
   27.19  
   27.20  <!--
   27.21  
    28.1 --- a/indra/newview/skins/metaharper/xui/es/panel_profile_secondlife.xml	Fri Feb 26 21:35:16 2016 +0100
    28.2 +++ b/indra/newview/skins/metaharper/xui/es/panel_profile_secondlife.xml	Fri Feb 26 21:36:15 2016 +0100
    28.3 @@ -9,7 +9,7 @@
    28.4  	<string name="CaptionTextAcctInfo">
    28.5  		[ACCTTYPE]
    28.6  [PAYMENTINFO]
    28.7 -[FSDEV][FSSUPP][FSQA][FIRESTORM]
    28.8 +[FSDEV][FSSUPP][FSQA][FSGW][FIRESTORM]
    28.9  	</string>
   28.10  	<string name="payment_update_link_url">
   28.11  		http://www.secondlife.com/account/billing.php?lang=es
   28.12 @@ -23,6 +23,7 @@
   28.13  	<string name="FSDev" value="Desarrollador/a "/>
   28.14  	<string name="FSSupp" value="Soporte "/>
   28.15  	<string name="FSQualityAssurance" value="Bug Hunter "/>
   28.16 +	<string name="FSGW" value="Gateway "/>
   28.17  	<text name="Name:" value="Nombre:" width="50"/>
   28.18  	<view_border right="-126" name="info_border"/>
   28.19  	<text_editor name="complete_name" value="(cargando...)" right="-126"/>
    29.1 --- a/indra/newview/skins/starlight/xui/en/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    29.2 +++ b/indra/newview/skins/starlight/xui/en/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    29.3 @@ -16,7 +16,7 @@
    29.4     <string
    29.5      name="CaptionTextAcctInfo">
    29.6         [ACCTTYPE]
    29.7 -[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    29.8 +[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    29.9      </string>
   29.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   29.11      sending the latter any more. ...TS -->
   29.12 @@ -29,6 +29,9 @@
   29.13      <string
   29.14        name="FSQualityAssurance"
   29.15        value=" Bug Hunter" />
   29.16 +    <string
   29.17 +     name="FSGW"
   29.18 +     value=" Gateway" />
   29.19     <string 
   29.20      name="RegisterDateFormat">
   29.21  	[REG_DATE] ([AGE])
    30.1 --- a/indra/newview/skins/starlight/xui/en/panel_my_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    30.2 +++ b/indra/newview/skins/starlight/xui/en/panel_my_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    30.3 @@ -11,7 +11,7 @@
    30.4      <string
    30.5       name="CaptionTextAcctInfo">
    30.6  [ACCTTYPE]
    30.7 -[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    30.8 +[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    30.9      </string>
   30.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   30.11      sending the latter any more. ...TS -->
   30.12 @@ -25,6 +25,9 @@
   30.13        name="FSQualityAssurance"
   30.14        value=" Bug Hunter" />
   30.15      <string
   30.16 +     name="FSGW"
   30.17 +     value=" Gateway" />
   30.18 +    <string
   30.19       name="payment_update_link_url">
   30.20          http://www.secondlife.com/account/billing.php?lang=en
   30.21      </string>
    31.1 --- a/indra/newview/skins/starlight/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:35:16 2016 +0100
    31.2 +++ b/indra/newview/skins/starlight/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:36:15 2016 +0100
    31.3 @@ -20,7 +20,7 @@
    31.4       name="CaptionTextAcctInfo">
    31.5  [ACCTTYPE]
    31.6  [PAYMENTINFO]
    31.7 -[FIRESTORM][FSDEV][FSSUPP][FSQA]
    31.8 +[FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    31.9      </string>
   31.10      <!-- [AGEVERIFICATION] moved out of the above, since it's not set anyway. See
   31.11      LLPanelAvatarProfile::fillAccountStatus() ...TS -->
   31.12 @@ -63,6 +63,9 @@
   31.13      <string
   31.14       name="FSQualityAssurance"
   31.15       value=" Bug Hunter" />
   31.16 +    <string
   31.17 +     name="FSGW"
   31.18 +     value=" Gateway" />
   31.19  
   31.20  <!--
   31.21  
    32.1 --- a/indra/newview/skins/starlightcui/xui/en/panel_edit_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    32.2 +++ b/indra/newview/skins/starlightcui/xui/en/panel_edit_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    32.3 @@ -16,7 +16,7 @@
    32.4     <string
    32.5      name="CaptionTextAcctInfo">
    32.6         [ACCTTYPE]
    32.7 -[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    32.8 +[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    32.9      </string>
   32.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   32.11      sending the latter any more. ...TS -->
   32.12 @@ -29,6 +29,9 @@
   32.13      <string
   32.14        name="FSQualityAssurance"
   32.15        value=" Bug Hunter" />
   32.16 +    <string
   32.17 +     name="FSGW"
   32.18 +     value=" Gateway" />
   32.19     <string 
   32.20      name="RegisterDateFormat">
   32.21  	[REG_DATE] ([AGE])
    33.1 --- a/indra/newview/skins/starlightcui/xui/en/panel_my_profile.xml	Fri Feb 26 21:35:16 2016 +0100
    33.2 +++ b/indra/newview/skins/starlightcui/xui/en/panel_my_profile.xml	Fri Feb 26 21:36:15 2016 +0100
    33.3 @@ -11,7 +11,7 @@
    33.4      <string
    33.5       name="CaptionTextAcctInfo">
    33.6  [ACCTTYPE]
    33.7 -[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA]
    33.8 +[PAYMENTINFO] [FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    33.9      </string>
   33.10  <!-- The previous line was [PAYMENTINFO] [AGEVERIFICATION], but they're not
   33.11      sending the latter any more. ...TS -->
   33.12 @@ -25,6 +25,9 @@
   33.13        name="FSQualityAssurance"
   33.14        value=" Bug Hunter" />
   33.15      <string
   33.16 +     name="FSGW"
   33.17 +     value=" Gateway" />
   33.18 +    <string
   33.19       name="payment_update_link_url">
   33.20          http://www.secondlife.com/account/billing.php?lang=en
   33.21      </string>
    34.1 --- a/indra/newview/skins/starlightcui/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:35:16 2016 +0100
    34.2 +++ b/indra/newview/skins/starlightcui/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:36:15 2016 +0100
    34.3 @@ -20,7 +20,7 @@
    34.4       name="CaptionTextAcctInfo">
    34.5  [ACCTTYPE]
    34.6  [PAYMENTINFO]
    34.7 -[FIRESTORM][FSDEV][FSSUPP][FSQA]
    34.8 +[FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    34.9      </string>
   34.10      <!-- [AGEVERIFICATION] moved out of the above, since it's not set anyway. See
   34.11      LLPanelAvatarProfile::fillAccountStatus() ...TS -->
   34.12 @@ -63,6 +63,9 @@
   34.13      <string
   34.14       name="FSQualityAssurance"
   34.15       value=" Bug Hunter" />
   34.16 +    <string
   34.17 +     name="FSGW"
   34.18 +     value=" Gateway" />
   34.19  
   34.20  <!--
   34.21  
    35.1 --- a/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:35:16 2016 +0100
    35.2 +++ b/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml	Fri Feb 26 21:36:15 2016 +0100
    35.3 @@ -20,7 +20,7 @@
    35.4       name="CaptionTextAcctInfo">
    35.5  [ACCTTYPE]
    35.6  [PAYMENTINFO]
    35.7 -[FIRESTORM][FSDEV][FSSUPP][FSQA]
    35.8 +[FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    35.9      </string>
   35.10      <!-- [AGEVERIFICATION] moved out of the above, since it's not set anyway. See
   35.11      LLPanelAvatarProfile::fillAccountStatus() ...TS -->
   35.12 @@ -62,6 +62,9 @@
   35.13      <string
   35.14       name="FSQualityAssurance"
   35.15       value=" Bug Hunter" />
   35.16 +    <string
   35.17 +     name="FSGW"
   35.18 +     value=" Gateway" />
   35.19  
   35.20  <!--
   35.21  
    36.1 --- a/indra/newview/skins/vintage/xui/ja/panel_profile_secondlife.xml	Fri Feb 26 21:35:16 2016 +0100
    36.2 +++ b/indra/newview/skins/vintage/xui/ja/panel_profile_secondlife.xml	Fri Feb 26 21:36:15 2016 +0100
    36.3 @@ -9,7 +9,7 @@
    36.4  	<string name="CaptionTextAcctInfo">
    36.5  		[ACCTTYPE]
    36.6  		[PAYMENTINFO]
    36.7 -		[FIRESTORM][FSDEV][FSSUPP][FSQA]
    36.8 +		[FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
    36.9  	</string>
   36.10  	<!-- [AGEVERIFICATION] moved out of the above, since it's not set anyway. See
   36.11  	LLPanelAvatarProfile::fillAccountStatus() ...TS -->
    37.1 --- a/package_override_vc12.ini	Fri Feb 26 21:35:16 2016 +0100
    37.2 +++ b/package_override_vc12.ini	Fri Feb 26 21:36:15 2016 +0100
    37.3 @@ -8,7 +8,7 @@
    37.4  windows = http://downloads.phoenixviewer.com/ogg_vorbis-1.2.2-1.3.2.201412081901-windows-x64-201412081901.tar.bz2|6d541e34af90e225c3605afc3ab5f520
    37.5  
    37.6  [apr_suite]
    37.7 -windows = http://downloads.phoenixviewer.com/apr_suite-1.4.5.201412051308-windows-x64-201412051308.tar.bz2|da32681c8fbcccb8f10d71a04aafb26c
    37.8 +windows = http://downloads.phoenixviewer.com/apr_suite-1.4.5.201602231252-r100-windows-x64-201602231252-r100.tar.bz2|45230669d56305f479bab020512f3c7e
    37.9  
   37.10  [ares]
   37.11  windows = http://downloads.phoenixviewer.com/ares-1.10.0.201412051139-windows-x64-201412051139.tar.bz2|c558757b6f9eeb07397543a602887414
    38.1 --- a/scripts/configure_firestorm.sh	Fri Feb 26 21:35:16 2016 +0100
    38.2 +++ b/scripts/configure_firestorm.sh	Fri Feb 26 21:36:15 2016 +0100
    38.3 @@ -351,9 +351,9 @@
    38.4      echo "Versioning..."
    38.5      pushd ..
    38.6      buildVer=`hg summary | head -1 | cut -d " "  -f 2 | cut -d : -f 1 | grep "[0-9]*"`
    38.7 -    majorVer=`cat indra/Version | cut -d "=" -f 2 | cut -d "." -f 1`
    38.8 -    minorVer=`cat indra/Version | cut -d "=" -f 2 | cut -d "." -f 2`
    38.9 -    patchVer=`cat indra/Version | cut -d "=" -f 2 | cut -d "." -f 3`
   38.10 +    majorVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 1`
   38.11 +    minorVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 2`
   38.12 +    patchVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 3`
   38.13      echo "Channel : ${CHANNEL}"
   38.14      echo "Version : ${majorVer}.${minorVer}.${patchVer}.${buildVer}"
   38.15      popd

mercurial