Merge Fireestorm LGPL

Fri, 02 Mar 2018 10:51:20 +0100

author
Ansariel
date
Fri, 02 Mar 2018 10:51:20 +0100
changeset 55308
b0549f776466
parent 55307
7087dc97640e
parent 54954
1c1b6f2218ab
child 55314
3db9986f3dc2

Merge Fireestorm LGPL

indra/newview/llappviewer.cpp file | annotate | diff | revisions
indra/newview/llviewerwindow.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/en/notifications.xml file | annotate | diff | revisions
     1.1 --- a/.hgtags	Tue Feb 27 18:13:33 2018 +0100
     1.2 +++ b/.hgtags	Fri Mar 02 10:51:20 2018 +0100
     1.3 @@ -571,3 +571,4 @@
     1.4  40ca7118765be85a043b31b011e4ee6bd9e33c95 5.0.9-release
     1.5  ad0e15543836d64d6399d28b32852510435e344a 5.1.0-release
     1.6  26d9e9bb166a9a417f35b1863223a597af8185fd 5.1.1-release
     1.7 +2eb917875efdfe920680b9049302d0f03721245d 5.1.2-release
     2.1 --- a/indra/newview/VIEWER_VERSION.txt	Tue Feb 27 18:13:33 2018 +0100
     2.2 +++ b/indra/newview/VIEWER_VERSION.txt	Fri Mar 02 10:51:20 2018 +0100
     2.3 @@ -1,1 +1,1 @@
     2.4 -5.1.2
     2.5 +5.1.3
     3.1 --- a/indra/newview/app_settings/grids.xml	Tue Feb 27 18:13:33 2018 +0100
     3.2 +++ b/indra/newview/app_settings/grids.xml	Fri Mar 02 10:51:20 2018 +0100
     3.3 @@ -408,42 +408,19 @@
     3.4          </map>
     3.5      <key>login.aurorascape.com:8002</key>
     3.6          <map>
     3.7 -		<key>DEPRECATED</key>
     3.8 +        <key>DEPRECATED</key>
     3.9              <string>TRUE</string>
    3.10          <key>name</key>
    3.11              <string>login.aurorascape.com:8002</string>
    3.12          </map>
    3.13      <key>login.avination.com/</key>
    3.14          <map>
    3.15 -        <key>LastModified</key>
    3.16 -            <date>2011-08-28T12:00:00.00Z</date>
    3.17 -        <key>about</key>
    3.18 -            <string>https://www.avination.com/</string>
    3.19 -        <key>grid_login_id</key>
    3.20 -            <string>login.avination.com/</string>
    3.21 -        <key>gridname</key>
    3.22 -            <string>Avination</string>
    3.23 -        <key>gridnick</key>
    3.24 -            <string>avination</string>
    3.25 -        <key>helperuri</key>
    3.26 -            <string>https://secure.3dhosting.de/</string>
    3.27 -        <key>login_identifier_types</key>
    3.28 -            <array>
    3.29 -                <string>agent</string>
    3.30 -                <string>account</string>
    3.31 -            </array>
    3.32 -        <key>loginpage</key>
    3.33 -            <string>https://www.avination.com/welcome.php</string>
    3.34 -        <key>loginuri</key>
    3.35 -            <array>
    3.36 -                <string>https://login.avination.com/</string>
    3.37 -            </array>
    3.38 +        <key>DEPRECATED</key>
    3.39 +            <string>TRUE</string>
    3.40          <key>name</key>
    3.41              <string>login.avination.com/</string>
    3.42 -        <key>register</key>
    3.43 -            <string>https://www.avination.com/join.html</string>
    3.44 -        <key>slurl_base</key>
    3.45 -            <string>https://login.avination.com/</string>
    3.46 +        <key>LastModified</key>
    3.47 +            <date>2018-02-28T15:36:26.43Z</date>
    3.48          </map>
    3.49      <key>login.francogrid.org:80</key>
    3.50          <map>
     4.1 --- a/indra/newview/installers/windows/installer_template.nsi	Tue Feb 27 18:13:33 2018 +0100
     4.2 +++ b/indra/newview/installers/windows/installer_template.nsi	Fri Mar 02 10:51:20 2018 +0100
     4.3 @@ -408,16 +408,16 @@
     4.4  # Write URL registry info
     4.5  WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"
     4.6  WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""
     4.7 -WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'
     4.8 +WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$VIEWER_EXE"'
     4.9  
    4.10  # URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.
    4.11 -WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" -url "%1"'
    4.12 -WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info"(default)" "URL:Second Life"
    4.13 +WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$VIEWER_EXE" -url "%1"'
    4.14 +WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "(default)" "URL:Second Life"
    4.15  WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info" "URL Protocol" ""
    4.16 -WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'
    4.17 +WriteRegStr HKEY_CLASSES_ROOT "x-grid-location-info\DefaultIcon" "" '"$INSTDIR\$VIEWER_EXE"'
    4.18  
    4.19  # URL param must be last item passed to viewer, it ignores subsequent params to avoid parameter injection attacks.
    4.20 -WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" '"$INSTDIR\$INSTEXE" -url "%1"'
    4.21 +WriteRegExpandStr HKEY_CLASSES_ROOT "x-grid-location-info\shell\open\command" "" '"$INSTDIR\$VIEWER_EXE" -url "%1"'
    4.22  
    4.23  # Only allow Launcher to be the icon
    4.24  # <FS:Ansariel> Remove VMP
     5.1 --- a/indra/newview/llappviewer.cpp	Tue Feb 27 18:13:33 2018 +0100
     5.2 +++ b/indra/newview/llappviewer.cpp	Fri Mar 02 10:51:20 2018 +0100
     5.3 @@ -937,22 +937,30 @@
     5.4  		LLFile::rmdir(base_dir + "data");
     5.5  		
     5.6  		// Delete per-user files below
     5.7 -		std::string per_user_dir_glob = base_dir + "*" + delem;
     5.8 -		
     5.9 -		LLFile::remove(per_user_dir_glob + "filters.xml");
    5.10 -		LLFile::remove(per_user_dir_glob + "medialist.xml");
    5.11 -		LLFile::remove(per_user_dir_glob + "plugin_cookies.xml");
    5.12 -		LLFile::remove(per_user_dir_glob + "screen_last.bmp");
    5.13 -		LLFile::remove(per_user_dir_glob + "search_history.xml");
    5.14 -		LLFile::remove(per_user_dir_glob + "settings_friends_groups.xml");
    5.15 -		LLFile::remove(per_user_dir_glob + "settings_per_account.xml");
    5.16 -		LLFile::remove(per_user_dir_glob + "teleport_history.xml");
    5.17 -		LLFile::remove(per_user_dir_glob + "texture_list_last.xml");
    5.18 -		LLFile::remove(per_user_dir_glob + "toolbars.xml");
    5.19 -		LLFile::remove(per_user_dir_glob + "typed_locations.xml");
    5.20 -		LLFile::remove(per_user_dir_glob + "url_history.xml");
    5.21 -		LLFile::remove(per_user_dir_glob + "volume_settings.xml");
    5.22 -		LLFile::rmdir(per_user_dir_glob + "browser_profile");
    5.23 +		LLDirIterator dir_it(base_dir, "*");
    5.24 +		std::string dir_name;
    5.25 +		while (dir_it.next(dir_name))
    5.26 +		{
    5.27 +			if (LLFile::isdir(base_dir + delem + dir_name))
    5.28 +			{
    5.29 +				std::string per_user_dir_glob = base_dir + delem + dir_name + delem;
    5.30 +
    5.31 +				LLFile::remove(per_user_dir_glob + "filters.xml");
    5.32 +				LLFile::remove(per_user_dir_glob + "medialist.xml");
    5.33 +				LLFile::remove(per_user_dir_glob + "plugin_cookies.xml");
    5.34 +				LLFile::remove(per_user_dir_glob + "screen_last.bmp");
    5.35 +				LLFile::remove(per_user_dir_glob + "search_history.xml");
    5.36 +				LLFile::remove(per_user_dir_glob + "settings_friends_groups.xml");
    5.37 +				LLFile::remove(per_user_dir_glob + "settings_per_account.xml");
    5.38 +				LLFile::remove(per_user_dir_glob + "teleport_history.xml");
    5.39 +				LLFile::remove(per_user_dir_glob + "texture_list_last.xml");
    5.40 +				LLFile::remove(per_user_dir_glob + "toolbars.xml");
    5.41 +				LLFile::remove(per_user_dir_glob + "typed_locations.xml");
    5.42 +				LLFile::remove(per_user_dir_glob + "url_history.xml");
    5.43 +				LLFile::remove(per_user_dir_glob + "volume_settings.xml");
    5.44 +				LLFile::rmdir(per_user_dir_glob + "browser_profile");
    5.45 +			}
    5.46 +		}
    5.47  	}
    5.48  // </FS>
    5.49  	init_default_trans_args();
     6.1 --- a/indra/newview/llviewerwindow.cpp	Tue Feb 27 18:13:33 2018 +0100
     6.2 +++ b/indra/newview/llviewerwindow.cpp	Fri Mar 02 10:51:20 2018 +0100
     6.3 @@ -5524,7 +5524,7 @@
     6.4  // <FS:Ansariel> Threaded filepickers
     6.5  void do_save_image(LLImageFormatted* image, const std::string& snapshot_dir, const std::string& base_name, const std::string& extension, boost::function<void(bool)> callback)
     6.6  {
     6.7 -	if (snapshot_dir.empty())
     6.8 +	if (snapshot_dir.empty() || !LLFile::isdir(snapshot_dir))
     6.9  	{
    6.10  		if (callback)
    6.11  		{
    6.12 @@ -5708,7 +5708,7 @@
    6.13  	//return image->save(filepath);
    6.14  
    6.15  	// Get a base file location if needed.
    6.16 -	if (force_picker || !isSnapshotLocSet())
    6.17 +	if (force_picker || !isSnapshotLocSet() || !LLFile::isdir(sSnapshotDir))
    6.18  	{
    6.19  		std::string proposed_name( sSnapshotBaseName );
    6.20  
     7.1 --- a/indra/newview/skins/default/xui/de/notifications.xml	Tue Feb 27 18:13:33 2018 +0100
     7.2 +++ b/indra/newview/skins/default/xui/de/notifications.xml	Fri Mar 02 10:51:20 2018 +0100
     7.3 @@ -4834,17 +4834,21 @@
     7.4      </form>
     7.5    </notification>
     7.6  
     7.7 -  <!-- Firestorm Phantom -->
     7.8 -
     7.9 -  <notification name="PhantomOn">
    7.10 -Phantom-Modus eingeschaltet.
    7.11 -  </notification>
    7.12 -
    7.13 -  <notification name="PhantomOff">
    7.14 -Phantom-Modus ausgeschaltet.
    7.15 -  </notification>
    7.16 -
    7.17 -<!-- Firestorm Phantom -->
    7.18 +	<notification name="PhantomOn">
    7.19 +		Phantom-Modus eingeschaltet.
    7.20 +	</notification>
    7.21 +	<notification name="PhantomOff">
    7.22 +		Phantom-Modus ausgeschaltet.
    7.23 +	</notification>
    7.24 +	<notification label="Alle Einstellungen zurücksetzen" name="FirestormClearSettingsPrompt">
    7.25 +		Ein Zurücksetzen aller Einstellungen kann bei Problemen hilfreich sein, allerdings müssen Sie anschließend jegliche Anpassungen erneut vornehmen.
    7.26 +
    7.27 +Sind Sie sicher, dass Sie alle Einstellungen zurücksetzen möchten?
    7.28 +		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
    7.29 +	</notification>
    7.30 +	<notification name="SettingsWillClear">
    7.31 +		Einstellungen werden nach einem Neustart von [APP_NAME] zurückgesetzt.
    7.32 +	</notification>
    7.33  
    7.34    <!-- ## Zi: Particle Editor -->
    7.35    <notification name="ParticleScriptFindFolderFailed">

mercurial