Merge viewer-lynx

Sun, 25 Mar 2018 14:20:07 +0200

author
Ansariel
date
Sun, 25 Mar 2018 14:20:07 +0200
changeset 55356
16e1428630ee
parent 55340
74610a6ecf5a
parent 55355
9123341e59d3
child 55357
1f13ef305465

Merge viewer-lynx

autobuild.xml file | annotate | diff | revisions
indra/media_plugins/cef/media_plugin_cef.cpp file | annotate | diff | revisions
indra/newview/llappviewer.cpp file | annotate | diff | revisions
indra/newview/llfloatersnapshot.cpp file | annotate | diff | revisions
indra/newview/llfloatersnapshot.h file | annotate | diff | revisions
indra/newview/llimprocessing.cpp file | annotate | diff | revisions
indra/newview/lllogininstance.cpp file | annotate | diff | revisions
indra/newview/llmeshrepository.cpp file | annotate | diff | revisions
indra/newview/llpanelmarketplaceinboxinventory.cpp file | annotate | diff | revisions
indra/newview/llpanelnearbymedia.cpp file | annotate | diff | revisions
indra/newview/llstartup.cpp file | annotate | diff | revisions
indra/newview/llviewerassetupload.cpp file | annotate | diff | revisions
indra/newview/llviewerregion.cpp file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Sun Mar 25 13:37:27 2018 +0200
     1.2 +++ b/autobuild.xml	Sun Mar 25 14:20:07 2018 +0200
     1.3 @@ -3562,9 +3562,9 @@
     1.4              <key>archive</key>
     1.5              <map>
     1.6                <key>hash</key>
     1.7 -              <string>f1248b6692dcbb1a42db87ca8d9fed93</string>
     1.8 -              <key>url</key>
     1.9 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13982/87166/viewer_manager-1.0.512801-darwin64-512801.tar.bz2</string>
    1.10 +              <string>4aefe12a3825d1b4b8370986d84792a2</string>
    1.11 +              <key>url</key>
    1.12 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15295/98583/viewer_manager-1.0.513540-darwin64-513540.tar.bz2</string>
    1.13              </map>
    1.14              <key>name</key>
    1.15              <string>darwin64</string>
    1.16 @@ -3586,9 +3586,9 @@
    1.17              <key>archive</key>
    1.18              <map>
    1.19                <key>hash</key>
    1.20 -              <string>c174ecc0893f8c193571b1dc80b823ad</string>
    1.21 -              <key>url</key>
    1.22 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13983/87172/viewer_manager-1.0.512801-windows-512801.tar.bz2</string>
    1.23 +              <string>db96bc8a83e6577d31657586100bfc35</string>
    1.24 +              <key>url</key>
    1.25 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15298/98589/viewer_manager-1.0.513540-windows-513540.tar.bz2</string>
    1.26              </map>
    1.27              <key>name</key>
    1.28              <string>windows</string>
    1.29 @@ -3599,7 +3599,7 @@
    1.30          <key>source_type</key>
    1.31          <string>hg</string>
    1.32          <key>version</key>
    1.33 -        <string>1.0.512801</string>
    1.34 +        <string>1.0.513540</string>
    1.35        </map>
    1.36        <key>vlc-bin</key>
    1.37        <map>
     2.1 --- a/indra/newview/llfloatersnapshot.cpp	Sun Mar 25 13:37:27 2018 +0200
     2.2 +++ b/indra/newview/llfloatersnapshot.cpp	Sun Mar 25 14:20:07 2018 +0200
     2.3 @@ -60,7 +60,7 @@
     2.4  
     2.5  const F32 AUTO_SNAPSHOT_TIME_DELAY = 1.f;
     2.6  
     2.7 -const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte
     2.8 +const S32 MAX_POSTCARD_DATASIZE = 1572864; // 1.5 megabyte, similar to simulator limit
     2.9  const S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512
    2.10  
    2.11  static LLDefaultChildRegistry::Register<LLSnapshotFloaterView> r("snapshot_floater_view");
    2.12 @@ -1418,6 +1418,11 @@
    2.13  	return 0;
    2.14  }
    2.15  
    2.16 +BOOL LLFloaterSnapshot::isWaitingState()
    2.17 +{
    2.18 +	return (impl->getStatus() == ImplBase::STATUS_WORKING);
    2.19 +}
    2.20 +
    2.21  BOOL LLFloaterSnapshotBase::ImplBase::updatePreviewList(bool initialized)
    2.22  {
    2.23  	LLFloaterFacebook* floater_facebook = LLFloaterReg::findTypedInstance<LLFloaterFacebook>("facebook");
     3.1 --- a/indra/newview/llfloatersnapshot.h	Sun Mar 25 13:37:27 2018 +0200
     3.2 +++ b/indra/newview/llfloatersnapshot.h	Sun Mar 25 14:20:07 2018 +0200
     3.3 @@ -165,6 +165,8 @@
     3.4  	// </FS:Ansariel>
     3.5  	static void setAgentEmail(const std::string& email);
     3.6  
     3.7 +	BOOL isWaitingState();
     3.8 +
     3.9  	class Impl;
    3.10  	friend class Impl;
    3.11  
     4.1 --- a/indra/newview/lllogininstance.cpp	Sun Mar 25 13:37:27 2018 +0200
     4.2 +++ b/indra/newview/lllogininstance.cpp	Sun Mar 25 14:20:07 2018 +0200
     4.3 @@ -284,6 +284,10 @@
     4.4  
     4.5  void LLLoginInstance::handleLoginFailure(const LLSD& event)
     4.6  {
     4.7 +    // TODO: we are handling failure in two separate places -
     4.8 +    // here and in STATE_LOGIN_PROCESS_RESPONSE processing
     4.9 +    // consider uniting them.
    4.10 +
    4.11      // Login has failed. 
    4.12      // Figure out why and respond...
    4.13      LLSD response = event["data"];
    4.14 @@ -353,6 +357,8 @@
    4.15      else if(   reason_response == "key"
    4.16              || reason_response == "presence"
    4.17              || reason_response == "connect"
    4.18 +            || !message_response.empty() // will be handled in STATE_LOGIN_PROCESS_RESPONSE
    4.19 +            || !response["message_id"].asString().empty()
    4.20              )
    4.21      {
    4.22          // these are events that have already been communicated elsewhere
     5.1 --- a/indra/newview/llmeshrepository.cpp	Sun Mar 25 13:37:27 2018 +0200
     5.2 +++ b/indra/newview/llmeshrepository.cpp	Sun Mar 25 14:20:07 2018 +0200
     5.3 @@ -1147,38 +1147,46 @@
     5.4  	
     5.5  	if (gAgent.getRegion())
     5.6  	{
     5.7 -		LLMutexLock lock(mMutex);
     5.8 -		// <FS:Ansariel> [UDP Assets]
     5.9 -        //res_url = mGetMeshCapability;
    5.10 -		if (!mGetMeshCapability.empty() && mLegacyGetMeshVersion == 0)
    5.11  		{
    5.12 -			res_url = mGetMeshCapability;
    5.13 +			LLMutexLock lock(mMutex);
    5.14 +			// <FS:Ansariel> [UDP Assets]
    5.15 +			//res_url = mGetMeshCapability;
    5.16 +			if (!mGetMeshCapability.empty() && mLegacyGetMeshVersion == 0)
    5.17 +			{
    5.18 +				res_url = mGetMeshCapability;
    5.19 +			}
    5.20 +			else if (!mLegacyGetMesh2Capability.empty() && mLegacyGetMeshVersion > 1)
    5.21 +			{
    5.22 +				res_url = mLegacyGetMesh2Capability;
    5.23 +				res_version = 2;
    5.24 +			}
    5.25 +			else
    5.26 +			{
    5.27 +				res_url = mLegacyGetMeshCapability;
    5.28 +				res_version = 1;
    5.29 +			}
    5.30 +			// </FS:Ansariel> [UDP Assets]
    5.31  		}
    5.32 -		else if (!mLegacyGetMesh2Capability.empty() && mLegacyGetMeshVersion > 1)
    5.33 +
    5.34 +		if (!res_url.empty())
    5.35  		{
    5.36 -			res_url = mLegacyGetMesh2Capability;
    5.37 -			res_version = 2;
    5.38 +			res_url += "/?mesh_id=";
    5.39 +			res_url += mesh_id.asString().c_str();
    5.40  		}
    5.41  		else
    5.42  		{
    5.43 -			res_url = mLegacyGetMeshCapability;
    5.44 -			res_version = 1;
    5.45 +			// <FS:Ansariel> [UDP Assets]
    5.46 +			//LL_WARNS_ONCE(LOG_MESH) << "Current region does not have ViewerAsset capability!  Cannot load meshes. Region id: "
    5.47 +			LL_WARNS_ONCE(LOG_MESH) << "Current region does not have ViewerAsset or GetMesh capability!  Cannot load "
    5.48 +			// </FS:Ansariel> [UDP Assets
    5.49 +									<< gAgent.getRegion()->getRegionID() << LL_ENDL;
    5.50 +			LL_DEBUGS_ONCE(LOG_MESH) << "Cannot load mesh " << mesh_id << " due to missing capability." << LL_ENDL;
    5.51  		}
    5.52 -		// </FS:Ansariel> [UDP Assets]
    5.53 -	}
    5.54 -
    5.55 -	if (! res_url.empty())
    5.56 -	{
    5.57 -		res_url += "/?mesh_id=";
    5.58 -		res_url += mesh_id.asString().c_str();
    5.59  	}
    5.60  	else
    5.61  	{
    5.62 -		// <FS:Ansariel> [UDP Assets]
    5.63 -		//LL_WARNS_ONCE(LOG_MESH) << "Current region does not have ViewerAsset capability!  Cannot load "
    5.64 -		LL_WARNS_ONCE(LOG_MESH) << "Current region does not have ViewerAsset or GetMesh capability!  Cannot load "
    5.65 -		// </FS:Ansariel> [UDP Assets]
    5.66 -								<< mesh_id << ".mesh" << LL_ENDL;
    5.67 +		LL_WARNS_ONCE(LOG_MESH) << "Current region is not loaded so there is no capability to load from! Cannot load meshes." << LL_ENDL;
    5.68 +		LL_DEBUGS_ONCE(LOG_MESH) << "Cannot load mesh " << mesh_id << " due to missing capability." << LL_ENDL;
    5.69  	}
    5.70  
    5.71  	*url = res_url;
     6.1 --- a/indra/newview/llpanelnearbymedia.cpp	Sun Mar 25 13:37:27 2018 +0200
     6.2 +++ b/indra/newview/llpanelnearbymedia.cpp	Sun Mar 25 14:20:07 2018 +0200
     6.3 @@ -539,6 +539,7 @@
     6.4  	if (NULL == mMediaList) return;
     6.5  	
     6.6  	mMediaList->deleteSingleItem(mMediaList->getItemIndex(id));
     6.7 +	mMediaList->updateLayout();
     6.8  }
     6.9  
    6.10  void LLPanelNearByMedia::refreshParcelItems()
    6.11 @@ -1107,7 +1108,7 @@
    6.12  			else {
    6.13  				showBasicControls(!impl->isMediaDisabled(), 
    6.14  								  ! impl->isParcelMedia(),  // include_zoom
    6.15 -								  LLViewerMediaFocus::getInstance()->isZoomed(),
    6.16 +								  LLViewerMediaFocus::getInstance()->isZoomedOnMedia(impl->getMediaTextureID()),
    6.17  								  impl->getVolume() == 0.0,
    6.18  								  impl->getVolume());
    6.19  			}
     7.1 --- a/indra/newview/llstartup.cpp	Sun Mar 25 13:37:27 2018 +0200
     7.2 +++ b/indra/newview/llstartup.cpp	Sun Mar 25 14:20:07 2018 +0200
     7.3 @@ -1765,7 +1765,7 @@
     7.4  
     7.5  						}
     7.6  					}
     7.7 -					else 
     7.8 +					else if (!message.empty())
     7.9  					{
    7.10  						// This wasn't a certificate error, so throw up the normal
    7.11  						// notificatioin message.
     8.1 --- a/indra/newview/llviewerassetupload.cpp	Sun Mar 25 13:37:27 2018 +0200
     8.2 +++ b/indra/newview/llviewerassetupload.cpp	Sun Mar 25 14:20:07 2018 +0200
     8.3 @@ -39,6 +39,7 @@
     8.4  #include "lleconomy.h"
     8.5  #include "llagent.h"
     8.6  #include "llfloaterreg.h"
     8.7 +#include "llfloatersnapshot.h"
     8.8  #include "llstatusbar.h"
     8.9  #include "llinventorypanel.h"
    8.10  #include "llsdutil.h"
    8.11 @@ -899,11 +900,23 @@
    8.12      }
    8.13  
    8.14      // Let the Snapshot floater know we have failed uploading.
    8.15 -    LLFloater* floater_snapshot = LLFloaterReg::findInstance("snapshot");
    8.16 -    if (uploadInfo->getAssetType() == LLAssetType::AT_TEXTURE && floater_snapshot)
    8.17 +    LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::findInstance();
    8.18 +    if (floater_snapshot && floater_snapshot->isWaitingState())
    8.19      {
    8.20 -        floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "inventory")));
    8.21 +        if (uploadInfo->getAssetType() == LLAssetType::AT_IMAGE_JPEG)
    8.22 +        {
    8.23 +            floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "postcard")));
    8.24 +        }
    8.25 +        if (uploadInfo->getAssetType() == LLAssetType::AT_TEXTURE)
    8.26 +        {
    8.27 +            floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "inventory")));
    8.28 +        }
    8.29      }
    8.30  
    8.31 +    LLFloater* floater_outfit_snapshot = LLFloaterReg::findInstance("outfit_snapshot");
    8.32 +    if (uploadInfo->getAssetType() == LLAssetType::AT_TEXTURE && floater_outfit_snapshot && floater_outfit_snapshot->isShown())
    8.33 +    {
    8.34 +        floater_outfit_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "inventory")));
    8.35 +    }
    8.36  }
    8.37  
     9.1 --- a/indra/newview/llviewermediafocus.cpp	Sun Mar 25 13:37:27 2018 +0200
     9.2 +++ b/indra/newview/llviewermediafocus.cpp	Sun Mar 25 14:20:07 2018 +0200
     9.3 @@ -82,7 +82,7 @@
     9.4  	if (media_impl.notNull() && objectp.notNull())
     9.5  	{
     9.6  		bool face_auto_zoom = false;
     9.7 -
     9.8 +		mPrevFocusedImplID = LLUUID::null;
     9.9  		mFocusedImplID = media_impl->getMediaTextureID();
    9.10  		mFocusedObjectID = objectp->getID();
    9.11  		mFocusedObjectFace = face;
    9.12 @@ -403,6 +403,7 @@
    9.13  			else
    9.14  			{
    9.15  				// Someone else has focus -- back off.
    9.16 +				mPrevFocusedImplID = mFocusedImplID;
    9.17  				clearFocus();
    9.18  			}
    9.19  		}
    9.20 @@ -602,6 +603,15 @@
    9.21  	return (mMediaControls.get() && mMediaControls.get()->getZoomLevel() != LLPanelPrimMediaControls::ZOOM_NONE);
    9.22  }
    9.23  
    9.24 +bool LLViewerMediaFocus::isZoomedOnMedia(LLUUID media_id)
    9.25 +{
    9.26 +	if (isZoomed())
    9.27 +	{
    9.28 +		return (mFocusedImplID == media_id) || (mPrevFocusedImplID == media_id);
    9.29 +	}
    9.30 +	return false;
    9.31 +}
    9.32 +
    9.33  LLUUID LLViewerMediaFocus::getControlsMediaID()
    9.34  {
    9.35  	if(getFocusedMediaImpl())
    10.1 --- a/indra/newview/llviewermediafocus.h	Sun Mar 25 13:37:27 2018 +0200
    10.2 +++ b/indra/newview/llviewermediafocus.h	Sun Mar 25 14:20:07 2018 +0200
    10.3 @@ -83,6 +83,7 @@
    10.4  	void focusZoomOnMedia(LLUUID media_id);
    10.5  	// Are we zoomed in?
    10.6  	bool isZoomed() const;
    10.7 +	bool isZoomedOnMedia(LLUUID media_id);
    10.8  	void unZoom();
    10.9  	
   10.10  	// Return the ID of the media instance the controls are currently attached to (either focus or hover).
   10.11 @@ -104,6 +105,7 @@
   10.12  	LLUUID mFocusedObjectID;
   10.13  	S32 mFocusedObjectFace;
   10.14  	LLUUID mFocusedImplID;
   10.15 +	LLUUID mPrevFocusedImplID;
   10.16  	LLVector3 mFocusedObjectNormal;
   10.17  	
   10.18  	LLUUID mHoverObjectID;

mercurial