Merge Firestorm LGPL

Fri, 18 May 2018 08:43:48 +0200

author
Ansariel
date
Fri, 18 May 2018 08:43:48 +0200
changeset 55376
d1e62eb8b2ac
parent 55375
87396b7b96ca
parent 55198
e741d9de98d0
child 55379
a780668b9a62

Merge Firestorm LGPL

indra/newview/llmeshrepository.cpp file | annotate | diff | revisions
indra/newview/llviewermenu.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/de/menu_viewer.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/de/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/menu_viewer.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/strings.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/it/strings.xml file | annotate | diff | revisions
indra/newview/viewer_manifest.py file | annotate | diff | revisions
     1.1 --- a/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt	Tue May 08 18:31:13 2018 +0200
     1.2 +++ b/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt	Fri May 18 08:43:48 2018 +0200
     1.3 @@ -223,7 +223,7 @@
     1.4      {
     1.5          if (i & PERMISSION_TAKE_CONTROLS)
     1.6          {
     1.7 -            // This also cause the script to work in no-script sims
     1.8 +            // This also cause the script to work in no-script parcels
     1.9              llTakeControls(CONTROL_FWD | CONTROL_BACK | CONTROL_LEFT | CONTROL_RIGHT | CONTROL_UP | CONTROL_DOWN, TRUE, TRUE);
    1.10          }
    1.11          else if (i & PERMISSION_ATTACH)
     2.1 --- a/indra/newview/fs_viewer_manifest.py	Tue May 08 18:31:13 2018 +0200
     2.2 +++ b/indra/newview/fs_viewer_manifest.py	Fri May 18 08:43:48 2018 +0200
     2.3 @@ -103,34 +103,16 @@
     2.4  
     2.5          self.run_command_shell( "cd %s && objcopy --add-gnu-debuglink=%s %s" % (debugDir, debugName, fileBin) )
     2.6          
     2.7 -        if( os.path.exists( "%s/firestorm-symbols-linux-%d.tar.bz2" % (self.args['configuration'].lower(), self.address_size)) ):
     2.8 -            symName = "%s/Phoenix_%s_%s_%s_symbols-linux-%d.tar.bz2" % ( self.args['configuration'].lower(), self.fs_channel_legacy_oneword(),
     2.9 -                                                                      '-'.join( self.args['version'] ), self.args['viewer_flavor'], self.address_size )
    2.10 -            print( "Saving symbols %s" % symName )
    2.11 -            os.rename("%s/firestorm-symbols-linux-%d.tar.bz2" % (self.args['configuration'].lower(), self.address_size), symName )
    2.12 +        self.fs_save_symbols("linux")
    2.13  
    2.14      def fs_linux_tar_excludes(self):
    2.15          installer_name_components = ['Phoenix',self.app_name(),self.args.get('arch'),'.'.join(self.args['version'])]
    2.16          installer_name = "_".join(installer_name_components)
    2.17          return "--exclude=%s/bin/.debug" % installer_name
    2.18  
    2.19 -    def fs_save_windows_symbols(self, substitution_strings):
    2.20 -        #AO: Try to package up symbols
    2.21 -        # New Method, for reading cross platform stack traces on a linux/mac host
    2.22 -        if (os.path.exists("%s/firestorm-symbols-windows-%d.tar.bz2" % (self.args['configuration'].lower(),
    2.23 -                                                                        self.address_size))):
    2.24 -            # Rename to add version numbers
    2.25 -            sName = "%s/Phoenix_%s_%s_%s_symbols-windows-%d.tar.bz2" % (self.args['configuration'].lower(),
    2.26 -                                                                     self.fs_channel_legacy_oneword(),
    2.27 -                                                                     substitution_strings['version_dashes'],
    2.28 -                                                                     self.args['viewer_flavor'],
    2.29 -                                                                     self.address_size)
    2.30 +    def fs_save_windows_symbols(self):
    2.31 +        self.fs_save_symbols("windows")
    2.32  
    2.33 -            if os.path.exists( sName ):
    2.34 -                os.unlink( sName )
    2.35 -
    2.36 -            os.rename("%s/firestorm-symbols-windows-%d.tar.bz2" % (self.args['configuration'].lower(), self.address_size), sName )
    2.37 -        
    2.38          pdbName = "firestorm-bin.pdb"
    2.39          try:
    2.40              subprocess.check_call( [ "pdbcopy.exe" ,
    2.41 @@ -147,7 +129,7 @@
    2.42          # Python3 natively supports tar+xz via mode 'w:xz'. But we're stuck with Python2 for now.
    2.43          symbolTar = tarfile.TarFile("%s/Phoenix_%s_%s_%s_pdbsymbols-windows-%d.tar" % (self.args['configuration'].lower(),
    2.44                                                                                      self.fs_channel_legacy_oneword(),
    2.45 -                                                                                    substitution_strings['version_dashes'],
    2.46 +                                                                                    '-'.join(self.args['version']),
    2.47                                                                                      self.args['viewer_flavor'],
    2.48                                                                                      self.address_size),
    2.49                                                                                      'w')
    2.50 @@ -183,3 +165,22 @@
    2.51          self.run_command_shell( "sudo -n chown root:root %s || exit 0" % ( filename) )
    2.52          self.run_command_shell( "sudo -n chmod 4755 %s || exit 0" % ( filename) )
    2.53  
    2.54 +    def fs_save_osx_symbols( self ):
    2.55 +        self.fs_save_symbols("darwin")
    2.56 +
    2.57 +    def fs_save_symbols(self, osname):
    2.58 +        if (os.path.exists("%s/firestorm-symbols-%s-%d.tar.bz2" % (self.args['configuration'].lower(),
    2.59 +                                                                       osname,
    2.60 +                                                                       self.address_size))):
    2.61 +            # Rename to add version numbers
    2.62 +            sName = "%s/Phoenix_%s_%s_%s_symbols-%s-%d.tar.bz2" % (self.args['configuration'].lower(),
    2.63 +                                                                       self.fs_channel_legacy_oneword(),
    2.64 +                                                                       '-'.join( self.args['version'] ),
    2.65 +                                                                       self.args['viewer_flavor'],
    2.66 +                                                                       osname,
    2.67 +                                                                       self.address_size)
    2.68 +
    2.69 +            if os.path.exists( sName ):
    2.70 +                os.unlink( sName )
    2.71 +
    2.72 +            os.rename("%s/firestorm-symbols-%s-%d.tar.bz2" % (self.args['configuration'].lower(), osname, self.address_size), sName)
     3.1 --- a/indra/newview/llfloaterpreference.cpp	Tue May 08 18:31:13 2018 +0200
     3.2 +++ b/indra/newview/llfloaterpreference.cpp	Fri May 18 08:43:48 2018 +0200
     3.3 @@ -3026,6 +3026,9 @@
     3.4  
     3.5  	// <FS:Ansariel> FIRE-18250: Option to disable default eye movement
     3.6  	getChildView("FSStaticEyes")->setEnabled(TRUE);
     3.7 +
     3.8 +	// <FS:Ansariel> FIRE-22564: Route llOwnerSay to scipt debug window
     3.9 +	getChildView("FSllOwnerSayToScriptDebugWindow_checkbox")->setEnabled(TRUE);
    3.10  }
    3.11  
    3.12  
     4.1 --- a/indra/newview/llfloaterregioninfo.cpp	Tue May 08 18:31:13 2018 +0200
     4.2 +++ b/indra/newview/llfloaterregioninfo.cpp	Fri May 18 08:43:48 2018 +0200
     4.3 @@ -314,19 +314,23 @@
     4.4  void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
     4.5  {
     4.6  	static LLDispatcher dispatch;
     4.7 -	LLFloaterRegionInfo* floater = LLFloaterReg::findTypedInstance<LLFloaterRegionInfo>("region_info");
     4.8 -	if(!floater)
     4.9 -	{
    4.10 -		return;
    4.11 -	}
    4.12 +	// <FS:Ansariel> FIRE-22573: Always refresh windlight even if floater not open
    4.13 +	//LLFloaterRegionInfo* floater = LLFloaterReg::findTypedInstance<LLFloaterRegionInfo>("region_info");
    4.14 +	//if(!floater)
    4.15 +	//{
    4.16 +	//	return;
    4.17 +	//}
    4.18 +	// </FS:Ansariel>
    4.19  	
    4.20  	if (!estate_dispatch_initialized)
    4.21  	{
    4.22  		LLPanelEstateInfo::initDispatch(dispatch);
    4.23  	}
    4.24  
    4.25 -	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
    4.26 -	LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
    4.27 +	// <FS:Ansariel> FIRE-22573: Always refresh windlight even if floater not open
    4.28 +	//LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
    4.29 +	//LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
    4.30 +	// </FS:Ansariel>
    4.31  
    4.32  	// unpack the message
    4.33  	std::string request;
    4.34 @@ -342,6 +346,17 @@
    4.35  	//dispatch the message
    4.36  	dispatch.dispatch(request, invoice, strings);
    4.37  
    4.38 +	// <FS:Ansariel> FIRE-22573: Always refresh windlight even if floater not open
    4.39 +	LLFloaterRegionInfo* floater = LLFloaterReg::findTypedInstance<LLFloaterRegionInfo>("region_info");
    4.40 +	if(!floater)
    4.41 +	{
    4.42 +		return;
    4.43 +	}
    4.44 +
    4.45 +	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
    4.46 +	LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
    4.47 +	// </FS:Ansariel>
    4.48 +
    4.49  	panel->updateControls(gAgent.getRegion());
    4.50  }
    4.51  
    4.52 @@ -349,6 +364,9 @@
    4.53  // static
    4.54  void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
    4.55  {
    4.56 +	// <FS:Ansariel> FIRE-22573: Always refresh windlight even if floater not open
    4.57 +	LLEnvManagerNew::instance().requestRegionSettings();
    4.58 +
    4.59  	LLPanel* panel;
    4.60  	LLFloaterRegionInfo* floater = LLFloaterReg::findTypedInstance<LLFloaterRegionInfo>("region_info");
    4.61  	if(!floater)
    4.62 @@ -360,7 +378,7 @@
    4.63  	// otherwise after we apply (send) updated region settings we won't get them back,
    4.64  	// so our environment won't be updated.
    4.65  	// This is also the way to know about externally changed region environment.
    4.66 -	LLEnvManagerNew::instance().requestRegionSettings();
    4.67 +	//LLEnvManagerNew::instance().requestRegionSettings(); // <FS:Ansariel> FIRE-22573: Always refresh windlight even if floater not open
    4.68  	
    4.69  	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
    4.70  
     5.1 --- a/indra/newview/llmeshrepository.cpp	Tue May 08 18:31:13 2018 +0200
     5.2 +++ b/indra/newview/llmeshrepository.cpp	Fri May 18 08:43:48 2018 +0200
     5.3 @@ -3504,8 +3504,12 @@
     5.4  
     5.5  	if (mDecompThread)
     5.6  	{
     5.7 -		mDecompThread->shutdown();		
     5.8 -		delete mDecompThread;
     5.9 +		mDecompThread->shutdown();
    5.10 +
    5.11 +		// <FS:ND> Deleting the thread at this point can lead to very subtle memory corruption due to the thread still possibly executing code that comes after shutdown does return.
    5.12 +		// Not nice, but leak it and let the OS clean up once process exit is complete.
    5.13 +		// delete mDecompThread;
    5.14 +		
    5.15  		mDecompThread = NULL;
    5.16  	}
    5.17  
     6.1 --- a/indra/newview/llviewermenu.cpp	Tue May 08 18:31:13 2018 +0200
     6.2 +++ b/indra/newview/llviewermenu.cpp	Fri May 18 08:43:48 2018 +0200
     6.3 @@ -7069,11 +7069,13 @@
     6.4  		{
     6.5  			gAgent.clearAlwaysRun();
     6.6  //			gAgent.clearRunning();
     6.7 +			report_to_nearby_chat(LLTrans::getString("AlwaysRunDisabled"));
     6.8  		}
     6.9  		else
    6.10  		{
    6.11  			gAgent.setAlwaysRun();
    6.12  //			gAgent.setRunning();
    6.13 +			report_to_nearby_chat(LLTrans::getString("AlwaysRunEnabled"));
    6.14  		}
    6.15  
    6.16  		// tell the simulator.
     7.1 --- a/indra/newview/skins/ansastorm/xui/en/panel_group_info_sidetray.xml	Tue May 08 18:31:13 2018 +0200
     7.2 +++ b/indra/newview/skins/ansastorm/xui/en/panel_group_info_sidetray.xml	Fri May 18 08:43:48 2018 +0200
     7.3 @@ -183,6 +183,7 @@
     7.4          follows="left|top|right"
     7.5          layout="topleft"
     7.6          left="0"
     7.7 +        help_topic="group_experiences_tab"
     7.8          name="group_experiences_tab_panel"
     7.9          top="0" />
    7.10      </tab_container>
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/indra/newview/skins/default/settings.xml	Fri May 18 08:43:48 2018 +0200
     8.3 @@ -0,0 +1,15 @@
     8.4 +<llsd>
     8.5 +<map>
     8.6 +    <key>FSLegacyEdgeSnap</key>
     8.7 +	<map>
     8.8 +		<key>Comment</key>
     8.9 +			<string>Use old method for adjusting edge snap regions.</string>
    8.10 +		<key>Persist</key>
    8.11 +			<integer>1</integer>
    8.12 +		<key>Type</key>
    8.13 +			<string>Boolean</string>
    8.14 +		<key>Value</key>
    8.15 +			<integer>0</integer>
    8.16 +	</map>
    8.17 +</map>
    8.18 +</llsd>
     9.1 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml	Tue May 08 18:31:13 2018 +0200
     9.2 +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml	Fri May 18 08:43:48 2018 +0200
     9.3 @@ -236,6 +236,7 @@
     9.4  		<menu_item_call label="Fehlerbehebung" name="Troubleshooting"/>
     9.5  		<menu_item_call label="Firestorm Support-Gruppe beitreten" name="firestorm_support_group"/>
     9.6  		<menu_item_call label="Stundenplan Firestorm-Klassen" name="Firestorm Classes Schedule"/>
     9.7 +		<menu_item_call label="Firestorm-Eventkalender" name="Firestorm Events Calendar"/>
     9.8  		<menu_item_call label="[CURRENT_GRID]-Hilfe" name="current_grid_help"/>
     9.9  		<menu_item_call label="Über [CURRENT_GRID]" name="current_grid_about"/>
    9.10  		<menu_item_call label="Grid-Status prüfen" name="Grid Status"/>
    10.1 --- a/indra/newview/skins/default/xui/de/strings.xml	Tue May 08 18:31:13 2018 +0200
    10.2 +++ b/indra/newview/skins/default/xui/de/strings.xml	Fri May 18 08:43:48 2018 +0200
    10.3 @@ -6776,14 +6776,18 @@
    10.4  	<string name="SLGridStatusOtherError">
    10.5  		SL-Grid-Status-Fehler: [STATUS] ( https://de.wikipedia.org/wiki/HTTP-Statuscode ).
    10.6  	</string>
    10.7 -
    10.8  	<string name="DoubleClickTeleportEnabled">
    10.9  		Doppelklick-Teleport aktiviert.
   10.10  	</string>
   10.11  	<string name="DoubleClickTeleportDisabled">
   10.12  		Doppelklick-Teleport deaktiviert.
   10.13  	</string>
   10.14 -
   10.15 +	<string name="AlwaysRunEnabled">
   10.16 +		Immer rennen aktiviert.
   10.17 +	</string>
   10.18 +	<string name="AlwaysRunDisabled">
   10.19 +		Immer rennen deaktiviert.
   10.20 +	</string>
   10.21  	<string name="FSRegionRestartInLocalChat">
   10.22  		Die Region, in der Sie sich gerade befinden, ist dabei neu zu starten. Falls Sie in dieser Region bleiben, werden Sie ausgeloggt.
   10.23  	</string>
    11.1 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml	Tue May 08 18:31:13 2018 +0200
    11.2 +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml	Fri May 18 08:43:48 2018 +0200
    11.3 @@ -2082,10 +2082,19 @@
    11.4           name="Firestorm Classes Schedule">
    11.5               <menu_item_call.on_click
    11.6               function="PromptShowURL"
    11.7 -             name="script_library_url"
    11.8 +             name="wiki_classes_url"
    11.9               parameter="WebLaunchExternalTarget,http://wiki.phoenixviewer.com/firestorm_classes" />
   11.10          </menu_item_call>
   11.11  
   11.12 +        <menu_item_call
   11.13 +         label="Firestorm Events Calendar"
   11.14 +         name="Firestorm Events Calendar">
   11.15 +             <menu_item_call.on_click
   11.16 +             function="PromptShowURL"
   11.17 +             name="events_calendar_url"
   11.18 +             parameter="WebLaunchExternalTarget,https://teamup.com/ksxdajnbw9mvw7cbwz" />
   11.19 +        </menu_item_call>
   11.20 +
   11.21  <!--       <menu_item_call
   11.22           label="Second Life Help"
   11.23           name="Second Life Help">
    12.1 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml	Tue May 08 18:31:13 2018 +0200
    12.2 +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml	Fri May 18 08:43:48 2018 +0200
    12.3 @@ -220,6 +220,7 @@
    12.4                 follows="left|top|right"
    12.5                 layout="topleft"
    12.6                 left="0"
    12.7 +               help_topic="group_experiences_tab"
    12.8                 name="group_experiences_tab_panel"
    12.9                 top="0" />
   12.10           </accordion_tab>
    13.1 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml	Tue May 08 18:31:13 2018 +0200
    13.2 +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml	Fri May 18 08:43:48 2018 +0200
    13.3 @@ -141,6 +141,7 @@
    13.4  			 label="Mark objects with (no name) when they speak to avoid spoofing"/>
    13.5              <check_box
    13.6               control_name="FSllOwnerSayToScriptDebugWindow"
    13.7 +             enabled="false"
    13.8               height="16"
    13.9               label="Route llOwnerSay to script debug window"
   13.10               layout="topleft"
    14.1 --- a/indra/newview/skins/default/xui/en/strings.xml	Tue May 08 18:31:13 2018 +0200
    14.2 +++ b/indra/newview/skins/default/xui/en/strings.xml	Fri May 18 08:43:48 2018 +0200
    14.3 @@ -3028,6 +3028,9 @@
    14.4    <string name="DoubleClickTeleportEnabled">DoubleClick Teleport enabled.</string>
    14.5    <string name="DoubleClickTeleportDisabled">DoubleClick Teleport disabled.</string>
    14.6  
    14.7 +  <string name="AlwaysRunEnabled">Always Run enabled.</string>
    14.8 +  <string name="AlwaysRunDisabled">Always Run disabled.</string>
    14.9 +
   14.10    <string name="FSRegionRestartInLocalChat">The region you are in now is about to restart. If you stay in this region you will be logged out.</string>
   14.11  
   14.12    <string name="Mute_Add">'[NAME]' has been added to the blocklist.</string>
    15.1 --- a/indra/newview/skins/default/xui/it/strings.xml	Tue May 08 18:31:13 2018 +0200
    15.2 +++ b/indra/newview/skins/default/xui/it/strings.xml	Fri May 18 08:43:48 2018 +0200
    15.3 @@ -26,7 +26,7 @@
    15.4  		Inizializzazione grafica non riuscita. Aggiorna il driver della scheda grafica!
    15.5  	</string>
    15.6  	<string name="AboutHeader">
    15.7 -		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([ADDRESS_SIZE]bit) ([CHANNEL])
    15.8 +		[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL] [ADDRESS_SIZE]bit)
    15.9  [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
   15.10  	</string>
   15.11  	<string name="BuildConfig">
   15.12 @@ -56,11 +56,28 @@
   15.13  		Versione OpenGL: [OPENGL_VERSION]
   15.14  	</string>
   15.15  	<string name="AboutSettings">
   15.16 -Versione libcurl: [LIBCURL_VERSION]
   15.17 -Versione J2C Decoder: [J2C_VERSION]
   15.18 -Versione Driver audio: [AUDIO_DRIVER_VERSION]
   15.19 -Versione CEF: [LIBCEF_VERSION]
   15.20 -Versione Server voice: [VOICE_VERSION]
   15.21 +		Modalità impostata: [MODE]
   15.22 +Viewer Skin: [SKIN] ([THEME])
   15.23 +Dimensione finestra: [WINDOW_WIDTH] x [WINDOW_HEIGHT] px
   15.24 +Carattere utilizzato: [FONT] ([FONT_SCREEN_DPI] dpi)
   15.25 +Regolazione dimensione carattere: [FONT_SIZE] pt
   15.26 +Scalabilità dell'interfaccia utente: [UI_SCALE_FACTOR]
   15.27 +Distanza di Visuale: [DRAW_DISTANCE] m
   15.28 +Larghezza di banda: [BANDWIDTH] kbit / s
   15.29 +Fattore LOD: [LOD]
   15.30 +Qualità di rendering: [RENDERQUALITY]
   15.31 +Ombre Attive: [ALMSTATUS]
   15.32 +Memoria texture: [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
   15.33 +Tempo di creazione VFS (cache) (UTC): [VFS_DATE]
   15.34 +	<string name="AboutLibs">
   15.35 +API RestrainedLove: [RLV_VERSION]
   15.36 +Versione di libcurl: [LIBCURL_VERSION]
   15.37 +Versione decodificatore J2C: [J2C_VERSION]
   15.38 +Versione del driver audio: [AUDIO_DRIVER_VERSION]
   15.39 +[LIBCEF_VERSION]
   15.40 +Versione di LibVLC: [LIBVLC_VERSION]
   15.41 +Versione server vocale: [VOICE_VERSION]
   15.42 +	</string>
   15.43  	</string>
   15.44  	<string name="AboutTraffic">
   15.45  		Pacchetti perduti: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
    16.1 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml	Tue May 08 18:31:13 2018 +0200
    16.2 +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml	Fri May 18 08:43:48 2018 +0200
    16.3 @@ -237,7 +237,8 @@
    16.4  		<menu_item_call label="Wiki Firestorma" name="Firestorm Wiki"/>
    16.5  		<menu_item_call label="Rozwiązywanie problemów" name="Troubleshooting"/>
    16.6  		<menu_item_call label="Dołącz do Grupy Wsparcia Firestorma" name="firestorm_support_group"/>
    16.7 -		<menu_item_call label="Harmonogram Lekcji Firestorma" name="Firestorm Classes Schedule"/>
    16.8 +		<menu_item_call label="Harmonogram lekcji Firestorma" name="Firestorm Classes Schedule"/>
    16.9 +		<menu_item_call label="Kalendarz wydarzeń Firestorma" name="Firestorm Events Calendar"/>
   16.10  		<!-- <menu_item_call label="Pomoc Second Life" name="Second Life Help"/> -->
   16.11  		<menu_item_call label="Pomoc: [CURRENT_GRID]" name="current_grid_help"/>
   16.12  		<menu_item_call label="Na temat [CURRENT_GRID]" name="current_grid_about"/>
    17.1 --- a/indra/newview/skins/default/xui/pl/strings.xml	Tue May 08 18:31:13 2018 +0200
    17.2 +++ b/indra/newview/skins/default/xui/pl/strings.xml	Fri May 18 08:43:48 2018 +0200
    17.3 @@ -6134,6 +6134,12 @@
    17.4  	<string name="DoubleClickTeleportDisabled">
    17.5  		Wyłączono teleport po dwukliku.
    17.6  	</string>
    17.7 +	<string name="AlwaysRunEnabled">
    17.8 +		Włączono tryb ciągłego biegania.
    17.9 +	</string>
   17.10 +	<string name="AlwaysRunDisabled">
   17.11 +		Wyłączono tryb ciągłego biegania.
   17.12 +	</string>
   17.13  	<string name="FSRegionRestartInLocalChat">
   17.14  		Region, w którym teraz jesteś zostanie za chwilę zrestartowany. Jeśli w nim zostaniesz, to symulator Cię wyloguje.
   17.15  	</string>
    18.1 --- a/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml	Tue May 08 18:31:13 2018 +0200
    18.2 +++ b/indra/newview/skins/firestorm/xui/en/panel_group_info_sidetray.xml	Fri May 18 08:43:48 2018 +0200
    18.3 @@ -183,6 +183,7 @@
    18.4          follows="left|top|right"
    18.5          layout="topleft"
    18.6          left="0"
    18.7 +        help_topic="group_experiences_tab"
    18.8          name="group_experiences_tab_panel"
    18.9          top="0" />
   18.10      </tab_container>
    19.1 --- a/indra/newview/skins/latency/xui/en/panel_group_info_sidetray.xml	Tue May 08 18:31:13 2018 +0200
    19.2 +++ b/indra/newview/skins/latency/xui/en/panel_group_info_sidetray.xml	Fri May 18 08:43:48 2018 +0200
    19.3 @@ -183,6 +183,7 @@
    19.4          follows="left|top|right"
    19.5          layout="topleft"
    19.6          left="0"
    19.7 +        help_topic="group_experiences_tab"
    19.8          name="group_experiences_tab_panel"
    19.9          top="0" />
   19.10      </tab_container>
    20.1 --- a/indra/newview/skins/latency/xui/en/panel_toolbar_view.xml	Tue May 08 18:31:13 2018 +0200
    20.2 +++ b/indra/newview/skins/latency/xui/en/panel_toolbar_view.xml	Fri May 18 08:43:48 2018 +0200
    20.3 @@ -15,7 +15,7 @@
    20.4  	 name="bottom_toolbar_stack"
    20.5  	 top="0"
    20.6  	 left="0"
    20.7 -	 height="500"
    20.8 +	 bottom="-58"
    20.9  	 width="1024"
   20.10  	 follows="all"
   20.11  	 border_size="0"
   20.12 @@ -75,7 +75,8 @@
   20.13  				</layout_panel>
   20.14  				<layout_panel
   20.15  				 name="non_toolbar_panel"
   20.16 -				 height="100"
   20.17 +				 follows="top|left|right"
   20.18 +				 bottom="48"
   20.19  				 width="200"
   20.20  				 auto_resize="true"
   20.21  				 mouse_opaque="false"
   20.22 @@ -162,6 +163,18 @@
   20.23  				</layout_panel>
   20.24  			</layout_stack>
   20.25  		</layout_panel>
   20.26 +	</layout_stack>
   20.27 +	<layout_stack
   20.28 +	 name="bottom_toolbar_stack2"
   20.29 +	 bottom="-1"
   20.30 +	 left="0"
   20.31 +	 height="213"
   20.32 +	 width="1024"
   20.33 +	 follows="bottom|left|right"
   20.34 +	 border_size="0"
   20.35 +	 mouse_opaque="false"
   20.36 +	 orientation="vertical"
   20.37 +	>
   20.38  		<!-- Nearby chat panel, resting on top of the bottom toolbar -->
   20.39  		<layout_panel
   20.40  		 name="bottom_chat_bar_panel"
    21.1 --- a/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml	Tue May 08 18:31:13 2018 +0200
    21.2 +++ b/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml	Fri May 18 08:43:48 2018 +0200
    21.3 @@ -183,6 +183,7 @@
    21.4          follows="left|top|right"
    21.5          layout="topleft"
    21.6          left="0"
    21.7 +        help_topic="group_experiences_tab"
    21.8          name="group_experiences_tab_panel"
    21.9          top="0" />
   21.10      </tab_container>
    22.1 --- a/indra/newview/skins/starlight/xui/en/panel_group_info_sidetray.xml	Tue May 08 18:31:13 2018 +0200
    22.2 +++ b/indra/newview/skins/starlight/xui/en/panel_group_info_sidetray.xml	Fri May 18 08:43:48 2018 +0200
    22.3 @@ -220,6 +220,7 @@
    22.4                 follows="left|top|right"
    22.5                 layout="topleft"
    22.6                 left="0"
    22.7 +               help_topic="group_experiences_tab"
    22.8                 name="group_experiences_tab_panel"
    22.9                 top="0" />
   22.10           </accordion_tab>
    23.1 --- a/indra/newview/skins/starlightcui/xui/en/panel_group_info_sidetray.xml	Tue May 08 18:31:13 2018 +0200
    23.2 +++ b/indra/newview/skins/starlightcui/xui/en/panel_group_info_sidetray.xml	Fri May 18 08:43:48 2018 +0200
    23.3 @@ -220,6 +220,7 @@
    23.4                 follows="left|top|right"
    23.5                 layout="topleft"
    23.6                 left="0"
    23.7 +               help_topic="group_experiences_tab"
    23.8                 name="group_experiences_tab_panel"
    23.9                 top="0" />
   23.10           </accordion_tab>
    24.1 --- a/indra/newview/skins/vintage/xui/en/panel_group_info_sidetray.xml	Tue May 08 18:31:13 2018 +0200
    24.2 +++ b/indra/newview/skins/vintage/xui/en/panel_group_info_sidetray.xml	Fri May 18 08:43:48 2018 +0200
    24.3 @@ -183,6 +183,7 @@
    24.4          follows="left|top|right"
    24.5          layout="topleft"
    24.6          left="0"
    24.7 +        help_topic="group_experiences_tab"
    24.8          name="group_experiences_tab_panel"
    24.9          top="0" />
   24.10      </tab_container>
    25.1 --- a/indra/newview/viewer_manifest.py	Tue May 08 18:31:13 2018 +0200
    25.2 +++ b/indra/newview/viewer_manifest.py	Fri May 18 08:43:48 2018 +0200
    25.3 @@ -956,8 +956,8 @@
    25.4              print >> sys.stderr, "Maximum nsis attempts exceeded; giving up"
    25.5              raise
    25.6  
    25.7 -        self.fs_sign_win_installer( substitution_strings ) # <FS:ND/> Sign files, step two. Sign installer.
    25.8 -        self.fs_save_windows_symbols( substitution_strings )
    25.9 +        self.fs_sign_win_installer(substitution_strings) # <FS:ND/> Sign files, step two. Sign installer.
   25.10 +        self.fs_save_windows_symbols()
   25.11  
   25.12          self.created_path(self.dst_path_of(installer_file))
   25.13          self.package_file = installer_file
   25.14 @@ -1866,7 +1866,7 @@
   25.15          # get rid of the temp file
   25.16          self.package_file = finalname
   25.17          self.remove(sparsename)
   25.18 -
   25.19 +        self.fs_save_osx_symbols()
   25.20  
   25.21  class Darwin_i386_Manifest(DarwinManifest):
   25.22      address_size = 32

mercurial