Merge Firestorm LGPL

Sun, 25 Mar 2018 13:37:27 +0200

author
Ansariel
date
Sun, 25 Mar 2018 13:37:27 +0200
changeset 55340
74610a6ecf5a
parent 55339
42bc0e961099
parent 54981
9caa2b90f044
child 55356
16e1428630ee

Merge Firestorm LGPL

indra/media_plugins/cef/media_plugin_cef.cpp file | annotate | diff | revisions
indra/newview/llappviewer.cpp file | annotate | diff | revisions
indra/newview/llinventorypanel.cpp file | annotate | diff | revisions
indra/newview/llpanelmarketplaceinboxinventory.cpp file | annotate | diff | revisions
indra/newview/llstartup.cpp file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Wed Mar 21 17:26:46 2018 +0100
     1.2 +++ b/autobuild.xml	Sun Mar 25 13:37:27 2018 +0200
     1.3 @@ -1972,9 +1972,9 @@
     1.4              <key>archive</key>
     1.5              <map>
     1.6                <key>hash</key>
     1.7 -              <string>75991f598df209713faf94b4a1cb1a89</string>
     1.8 -              <key>url</key>
     1.9 -              <string>file:///opt/firestorm/kdu-7.A.3-darwin-180711129.tar.bz2</string>
    1.10 +              <string>814bec3fa5045a18dce2bc4ce78b585d</string>
    1.11 +              <key>url</key>
    1.12 +              <string>file:///opt/firestorm/kdu-7.A.4-darwin-180792321.tar.bz2</string>
    1.13              </map>
    1.14              <key>name</key>
    1.15              <string>darwin</string>
    1.16 @@ -1984,9 +1984,9 @@
    1.17              <key>archive</key>
    1.18              <map>
    1.19                <key>hash</key>
    1.20 -              <string>75991f598df209713faf94b4a1cb1a89</string>
    1.21 -              <key>url</key>
    1.22 -              <string>file:///opt/firestorm/kdu-7.A.3-darwin-180711129.tar.bz2</string>
    1.23 +              <string>814bec3fa5045a18dce2bc4ce78b585d</string>
    1.24 +              <key>url</key>
    1.25 +              <string>file:///opt/firestorm/kdu-7.A.4-darwin-180792321.tar.bz2</string>
    1.26              </map>
    1.27              <key>name</key>
    1.28              <string>darwin64</string>
     2.1 --- a/indra/media_plugins/cef/media_plugin_cef.cpp	Wed Mar 21 17:26:46 2018 +0100
     2.2 +++ b/indra/media_plugins/cef/media_plugin_cef.cpp	Sun Mar 25 13:37:27 2018 +0200
     2.3 @@ -749,7 +749,7 @@
     2.4  
     2.5  	// adding new code below in unicodeInput means we don't send ascii chars
     2.6  	// here too or we get double key presses on a mac.  
     2.7 -	if (((unsigned char)event_chars < 0x20 || (unsigned char)event_chars >= 0x7f ))
     2.8 +	if (((unsigned char)event_chars < 0x10 || (unsigned char)event_chars >= 0x7f ))
     2.9  	{
    2.10  		mCEFLib->nativeKeyboardEventOSX(key_event, event_modifiers, 
    2.11  										event_keycode, event_chars, 
     3.1 --- a/indra/newview/fs_viewer_manifest.py	Wed Mar 21 17:26:46 2018 +0100
     3.2 +++ b/indra/newview/fs_viewer_manifest.py	Sun Mar 25 13:37:27 2018 +0200
     3.3 @@ -103,11 +103,11 @@
     3.4  
     3.5          self.run_command_shell( "cd %s && objcopy --add-gnu-debuglink=%s %s" % (debugDir, debugName, fileBin) )
     3.6          
     3.7 -        if( os.path.exists( "%s/firestorm-symbols-linux.tar.bz2" % self.args['configuration'].lower()) ):
     3.8 -            symName = "%s/Phoenix_%s_%s_%s_symbols-linux.tar.bz2" % ( self.args['configuration'].lower(), self.fs_channel_legacy_oneword(),
     3.9 -                                                                      '-'.join( self.args['version'] ), self.args['viewer_flavor'] )
    3.10 +        if( os.path.exists( "%s/firestorm-symbols-linux-%d.tar.bz2" % (self.args['configuration'].lower(), self.address_size)) ):
    3.11 +            symName = "%s/Phoenix_%s_%s_%s_symbols-linux-%d.tar.bz2" % ( self.args['configuration'].lower(), self.fs_channel_legacy_oneword(),
    3.12 +                                                                      '-'.join( self.args['version'] ), self.args['viewer_flavor'], self.address_size )
    3.13              print( "Saving symbols %s" % symName )
    3.14 -            os.rename("%s/firestorm-symbols-linux.tar.bz2" % self.args['configuration'].lower(), symName )
    3.15 +            os.rename("%s/firestorm-symbols-linux-%d.tar.bz2" % (self.args['configuration'].lower(), self.address_size), symName )
    3.16  
    3.17      def fs_linux_tar_excludes(self):
    3.18          return "--exclude core --exclude .debug/* --exclude .debug"
    3.19 @@ -115,17 +115,19 @@
    3.20      def fs_save_windows_symbols(self, substitution_strings):
    3.21          #AO: Try to package up symbols
    3.22          # New Method, for reading cross platform stack traces on a linux/mac host
    3.23 -        if (os.path.exists("%s/firestorm-symbols-windows.tar.bz2" % self.args['configuration'].lower())):
    3.24 +        if (os.path.exists("%s/firestorm-symbols-windows-%d.tar.bz2" % (self.args['configuration'].lower(),
    3.25 +                                                                        self.address_size))):
    3.26              # Rename to add version numbers
    3.27 -            sName = "%s/Phoenix_%s_%s_%s_symbols-windows.tar.bz2" % (self.args['configuration'].lower(),
    3.28 +            sName = "%s/Phoenix_%s_%s_%s_symbols-windows-%d.tar.bz2" % (self.args['configuration'].lower(),
    3.29                                                                       self.fs_channel_legacy_oneword(),
    3.30                                                                       substitution_strings['version_dashes'],
    3.31 -                                                                     self.args['viewer_flavor'])
    3.32 +                                                                     self.args['viewer_flavor'],
    3.33 +                                                                     self.address_size)
    3.34  
    3.35              if os.path.exists( sName ):
    3.36                  os.unlink( sName )
    3.37  
    3.38 -            os.rename("%s/firestorm-symbols-windows.tar.bz2" % self.args['configuration'].lower(), sName )
    3.39 +            os.rename("%s/firestorm-symbols-windows-%d.tar.bz2" % (self.args['configuration'].lower(), self.address_size), sName )
    3.40          
    3.41          pdbName = "firestorm-bin.pdb"
    3.42          try:
    3.43 @@ -141,10 +143,11 @@
    3.44          # Store windows symbols we want to keep for debugging in a tar file, this will be later compressed with xz (lzma)
    3.45          # Using tat+xz gives far superior compression than zip (~half the size of the zip archive).
    3.46          # Python3 natively supports tar+xz via mode 'w:xz'. But we're stuck with Python2 for now.
    3.47 -        symbolTar = tarfile.TarFile("%s/Phoenix_%s_%s_%s_pdbsymbols-windows.tar" % (self.args['configuration'].lower(),
    3.48 +        symbolTar = tarfile.TarFile("%s/Phoenix_%s_%s_%s_pdbsymbols-windows-%d.tar" % (self.args['configuration'].lower(),
    3.49                                                                                      self.fs_channel_legacy_oneword(),
    3.50                                                                                      substitution_strings['version_dashes'],
    3.51 -                                                                                    self.args['viewer_flavor']),
    3.52 +                                                                                    self.args['viewer_flavor'],
    3.53 +                                                                                    self.address_size),
    3.54                                                                                      'w')
    3.55          symbolTar.add( "%s/Firestorm-bin.exe" % self.args['configuration'].lower(), "firestorm-bin.exe" )
    3.56          symbolTar.add( "%s/%s" % (self.args['configuration'].lower(),pdbName), pdbName )
     4.1 --- a/indra/newview/fsdata.cpp	Wed Mar 21 17:26:46 2018 +0100
     4.2 +++ b/indra/newview/fsdata.cpp	Sun Mar 25 13:37:27 2018 +0200
     4.3 @@ -966,10 +966,8 @@
     4.4  	LLSD info = LLAppViewer::instance()->getViewerInfo();
     4.5  
     4.6  	std::string sysinfo1("\n");
     4.7 -	sysinfo1 += llformat("%s %s (%d) %s %s (%s) %s\n\n", LLAppViewer::instance()->getSecondLifeTitle().c_str(), LLVersionInfo::getShortVersion().c_str(), LLVersionInfo::getBuild(), info["BUILD_DATE"].asString().c_str(), info["BUILD_TIME"].asString().c_str(), LLVersionInfo::getChannel().c_str(),
     4.8 -//<FS:CR> FIRE-8273: Add Havok/Opensim indicator to getSystemInfo()
     4.9 -		info["BUILD_TYPE"].asString().c_str());
    4.10 -// </FS:CR>
    4.11 +	sysinfo1 += llformat("%s %s (%d) %s %s (%s %dbit) %s\n\n", LLAppViewer::instance()->getSecondLifeTitle().c_str(), LLVersionInfo::getShortVersion().c_str(), LLVersionInfo::getBuild(), info["BUILD_DATE"].asString().c_str(), info["BUILD_TIME"].asString().c_str(), LLVersionInfo::getChannel().c_str(),
    4.12 +		info["ADDRESS_SIZE"].asInteger(), info["BUILD_TYPE"].asString().c_str());
    4.13  	sysinfo1 += llformat("Build with %s version %s\n\n", info["COMPILER"].asString().c_str(), info["COMPILER_VERSION"].asString().c_str());
    4.14  	sysinfo1 += llformat("I am in %s located at %s (%s)\n", info["REGION"].asString().c_str(), info["HOSTNAME"].asString().c_str(), info["HOSTIP"].asString().c_str());
    4.15  	sysinfo1 += llformat("%s\n\n", info["SERVER_VERSION"].asString().c_str());
    4.16 @@ -990,7 +988,7 @@
    4.17  	sysinfo2 += llformat("libcurl Version: %s\n", info["LIBCURL_VERSION"].asString().c_str());
    4.18  	sysinfo2 += llformat("J2C Decoder Version: %s\n", info["J2C_VERSION"].asString().c_str());
    4.19  	sysinfo2 += llformat("Audio Driver Version: %s\n", info["AUDIO_DRIVER_VERSION"].asString().c_str());
    4.20 -	sysinfo2 += llformat("CEF Version: %s\n", info["LLCEFLIB_VERSION"].asString().c_str());
    4.21 +	sysinfo2 += llformat("%s\n", info["LIBCEF_VERSION"].asString().c_str());
    4.22  	sysinfo2 += llformat("LibVLC Version: %s\n", info["LIBVLC_VERSION"].asString().c_str());
    4.23  
    4.24  	sysinfo2 += llformat("Vivox Version: %s\n", info["VOICE_VERSION"].asString().c_str());
     5.1 --- a/indra/newview/llappviewer.cpp	Wed Mar 21 17:26:46 2018 +0100
     5.2 +++ b/indra/newview/llappviewer.cpp	Sun Mar 25 13:37:27 2018 +0200
     5.3 @@ -1144,10 +1144,11 @@
     5.4  
     5.5  	if (!initCache())
     5.6  	{
     5.7 +		LL_WARNS("InitInfo") << "Failed to init cache" << LL_ENDL;
     5.8  		std::ostringstream msg;
     5.9  		msg << LLTrans::getString("MBUnableToAccessFile");
    5.10  		OSMessageBox(msg.str(),LLStringUtil::null,OSMB_OK);
    5.11 -		return 1;
    5.12 +		return 0;
    5.13  	}
    5.14  	LL_INFOS("InitInfo") << "Cache initialization is done." << LL_ENDL ;
    5.15  
    5.16 @@ -1657,7 +1658,8 @@
    5.17  			// Scan keyboard for movement keys.  Command keys and typing
    5.18  			// are handled by windows callbacks.  Don't do this until we're
    5.19  			// done initializing.  JC
    5.20 -			if ((gHeadlessClient || gViewerWindow->getWindow()->getVisible())
    5.21 +			if (gViewerWindow
    5.22 +				&& (gHeadlessClient || gViewerWindow->getWindow()->getVisible())
    5.23  				&& gViewerWindow->getActive()
    5.24  				&& !gViewerWindow->getWindow()->getMinimized()
    5.25  				&& LLStartUp::getStartupState() == STATE_STARTED
    5.26 @@ -1696,7 +1698,7 @@
    5.27  
    5.28  			// Render scene.
    5.29  			// *TODO: Should we run display() even during gHeadlessClient?  DK 2011-02-18
    5.30 -			if (!LLApp::isExiting() && !gHeadlessClient)
    5.31 +			if (!LLApp::isExiting() && !gHeadlessClient && gViewerWindow)
    5.32  			{
    5.33  				pingMainloopTimeout("Main:Display");
    5.34  				gGLActive = TRUE;
     6.1 --- a/indra/newview/llimprocessing.cpp	Wed Mar 21 17:26:46 2018 +0100
     6.2 +++ b/indra/newview/llimprocessing.cpp	Sun Mar 25 13:37:27 2018 +0200
     6.3 @@ -2109,7 +2109,7 @@
     6.4  
     6.5      if (!status) // success = httpResults["success"].asBoolean();
     6.6      {
     6.7 -        LL_WARNS() << "Error requesting offline messages via capability " << url << ", Status: " << status.toString() << "\nFalling back to legacy method." << LL_ENDL;
     6.8 +        LL_WARNS("Messaging") << "Error requesting offline messages via capability " << url << ", Status: " << status.toString() << "\nFalling back to legacy method." << LL_ENDL;
     6.9  
    6.10          requestOfflineMessagesLegacy();
    6.11          return;
    6.12 @@ -2119,10 +2119,11 @@
    6.13  
    6.14      if (!contents.size())
    6.15      {
    6.16 -        LL_WARNS() << "No contents received for offline messages via capability " << url << LL_ENDL;
    6.17 +        LL_WARNS("Messaging") << "No contents received for offline messages via capability " << url << LL_ENDL;
    6.18          return;
    6.19      }
    6.20  
    6.21 +    // Todo: once dirtsim-369 releases, remove one of the map/array options
    6.22      LLSD messages;
    6.23      if (contents.isArray())
    6.24      {
    6.25 @@ -2134,16 +2135,24 @@
    6.26      }
    6.27      else
    6.28      {
    6.29 -        LL_WARNS() << "Invalid offline message content received via capability " << url << LL_ENDL;
    6.30 +        LL_WARNS("Messaging") << "Invalid offline message content received via capability " << url << LL_ENDL;
    6.31          return;
    6.32      }
    6.33  
    6.34      if (!messages.isArray())
    6.35      {
    6.36 -        LL_WARNS() << "Invalid offline message content received via capability " << url << LL_ENDL;
    6.37 +        LL_WARNS("Messaging") << "Invalid offline message content received via capability " << url << LL_ENDL;
    6.38          return;
    6.39      }
    6.40  
    6.41 +    if (messages.emptyArray())
    6.42 +    {
    6.43 +        // Nothing to process
    6.44 +        return;
    6.45 +    }
    6.46 +
    6.47 +    LL_INFOS("Messaging") << "Processing offline messages." << LL_ENDL;
    6.48 +
    6.49      std::vector<U8> data;
    6.50      S32 binary_bucket_size = 0;
    6.51      LLHost sender = gAgent.getRegion()->getHost();
    6.52 @@ -2156,10 +2165,21 @@
    6.53          LLVector3 position(message_data["local_x"].asReal(), message_data["local_y"].asReal(), message_data["local_z"].asReal());
    6.54          data = message_data["binary_bucket"].asBinary();
    6.55          binary_bucket_size = data.size(); // message_data["count"] == data.size() - 1 due to ('\0')
    6.56 -        U32 parent_estate_id = message_data.has("parent_estate_id") ? message_data["ParentEstateID"].asInteger() : 1; // 1 - IMMainland
    6.57 +        U32 parent_estate_id = message_data.has("parent_estate_id") ? message_data["parent_estate_id"].asInteger() : 1; // 1 - IMMainland
    6.58 +
    6.59 +        // Todo: once dirtsim-369 releases, remove one of the int/str options
    6.60 +        BOOL from_group;
    6.61 +        if (message_data["from_group"].isInteger())
    6.62 +        {
    6.63 +            from_group = message_data["from_group"].asInteger();
    6.64 +        }
    6.65 +        else
    6.66 +        {
    6.67 +            from_group = message_data["from_group"].asString() == "Y";
    6.68 +        }
    6.69  
    6.70          LLIMProcessing::processNewMessage(message_data["from_agent_id"].asUUID(),
    6.71 -            message_data["from_group"].asInteger(), // BOOL
    6.72 +            from_group,
    6.73              message_data["to_agent_id"].asUUID(),
    6.74              IM_OFFLINE,
    6.75              (EInstantMessage)message_data["dialog"].asInteger(),
    6.76 @@ -2178,6 +2198,8 @@
    6.77  
    6.78  void LLIMProcessing::requestOfflineMessagesLegacy()
    6.79  {
    6.80 +    LL_INFOS("Messaging") << "Requesting offline messages (Legacy)." << LL_ENDL;
    6.81 +
    6.82      LLMessageSystem* msg = gMessageSystem;
    6.83      msg->newMessageFast(_PREHASH_RetrieveInstantMessages);
    6.84      msg->nextBlockFast(_PREHASH_AgentData);
     7.1 --- a/indra/newview/llinventorypanel.cpp	Wed Mar 21 17:26:46 2018 +0100
     7.2 +++ b/indra/newview/llinventorypanel.cpp	Sun Mar 25 13:37:27 2018 +0200
     7.3 @@ -1230,7 +1230,7 @@
     7.4  			{
     7.5  				if(prev_folder_item)
     7.6  				{
     7.7 -					LLFolderBridge* prev_bridge = (LLFolderBridge*)prev_folder_item->getViewModelItem();
     7.8 +					LLFolderBridge* prev_bridge = static_cast<LLFolderBridge*>(prev_folder_item->getViewModelItem());
     7.9  					if(prev_bridge)
    7.10  					{
    7.11  						prev_bridge->clearDisplayName();
    7.12 @@ -1239,7 +1239,7 @@
    7.13  					}
    7.14  				}
    7.15  
    7.16 -				LLFolderBridge* bridge = (LLFolderBridge*)folder_item->getViewModelItem();
    7.17 +				LLFolderBridge* bridge = static_cast<LLFolderBridge*>(folder_item->getViewModelItem());
    7.18  				if(bridge)
    7.19  				{
    7.20  					bridge->clearDisplayName();
    7.21 @@ -1254,7 +1254,7 @@
    7.22  	{
    7.23  		if(prev_folder_item)
    7.24  		{
    7.25 -			LLFolderBridge* prev_bridge = (LLFolderBridge*)prev_folder_item->getViewModelItem();
    7.26 +			LLFolderBridge* prev_bridge = static_cast<LLFolderBridge*>(prev_folder_item->getViewModelItem());
    7.27  			if(prev_bridge)
    7.28  			{
    7.29  				prev_bridge->clearDisplayName();
     8.1 --- a/indra/newview/llpanelmarketplaceinboxinventory.cpp	Wed Mar 21 17:26:46 2018 +0100
     8.2 +++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp	Sun Mar 25 13:37:27 2018 +0200
     8.3 @@ -181,10 +181,10 @@
     8.4  	return LLFolderViewFolder::handleDoubleClick(x, y, mask);
     8.5  }
     8.6  
     8.7 -void LLInboxFolderViewFolder::selectItem()
     8.8 -{
     8.9 -	deFreshify();
    8.10 -	LLFolderViewFolder::selectItem();
    8.11 +void LLInboxFolderViewFolder::selectItem()
    8.12 +{
    8.13 +	deFreshify();
    8.14 +	LLFolderViewFolder::selectItem();
    8.15  }
    8.16  
    8.17  void LLInboxFolderViewFolder::computeFreshness()
     9.1 --- a/indra/newview/llstartup.cpp	Wed Mar 21 17:26:46 2018 +0100
     9.2 +++ b/indra/newview/llstartup.cpp	Sun Mar 25 13:37:27 2018 +0200
     9.3 @@ -557,6 +557,13 @@
     9.4  // true when all initialization done.
     9.5  bool idle_startup()
     9.6  {
     9.7 +	if (gViewerWindow == NULL)
     9.8 +	{
     9.9 +		// We expect window to be initialized
    9.10 +		LL_WARNS_ONCE() << "gViewerWindow is not initialized" << LL_ENDL;
    9.11 +		return false; // No world yet
    9.12 +	}
    9.13 +
    9.14  	const F32 PRECACHING_DELAY = gSavedSettings.getF32("PrecachingDelay");
    9.15  	static LLTimer timeout;
    9.16  
    10.1 --- a/indra/newview/llviewerregion.cpp	Wed Mar 21 17:26:46 2018 +0100
    10.2 +++ b/indra/newview/llviewerregion.cpp	Sun Mar 25 13:37:27 2018 +0200
    10.3 @@ -299,6 +299,13 @@
    10.4              continue;
    10.5          }
    10.6  
    10.7 +        if (!result.isMap() || result.has("error"))
    10.8 +        {
    10.9 +            LL_WARNS("AppInit", "Capabilities") << "Malformed response" << LL_ENDL;
   10.10 +            // setup for retry.
   10.11 +            continue;
   10.12 +        }
   10.13 +
   10.14          LLSD httpResults = result["http_result"];
   10.15          LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
   10.16          if (!status)
    11.1 --- a/indra/newview/skins/default/xui/en/floater_my_appearance.xml	Wed Mar 21 17:26:46 2018 +0100
    11.2 +++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml	Sun Mar 25 13:37:27 2018 +0200
    11.3 @@ -13,7 +13,7 @@
    11.4    reuse_instance="true"
    11.5    title="Appearance"
    11.6    min_height="200"
    11.7 -  min_width="325"
    11.8 +  min_width="351"
    11.9    width="333">
   11.10      <panel
   11.11        top="18"

mercurial