Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer

indra/newview/VIEWER_VERSION.txt

@@ -1 +1 @@
-6.5.2
+6.5.3

indra/newview/installers/darwin/apple-notarize.sh

@@ -16,8 +16,9 @@ if [ -f "$CONFIG_FILE" ]; then
                                    --password $PASSWORD \
                                    --asc-provider $ASC_PROVIDER \
                                    --file "$zip_file" 2>&1)
+        echo $res
+        
         requestUUID=$(echo $res | awk '/RequestUUID/ { print $NF; }')
-
         echo "Apple Notarization RequestUUID: $requestUUID"
 
         if [[ -n $requestUUID ]]; then

indra/newview/llfloatermediasettings.cpp

@@ -156,6 +156,18 @@ void LLFloaterMediaSettings::apply()
 	}
 }
 
+////////////////////////////////////////////////////////////////////////////////
+void LLFloaterMediaSettings::onOpen(const LLSD& key)
+{
+    if (mPanelMediaSettingsGeneral)
+    {
+        // media is expensive, so only load it when nessesary.
+        // If we need to preload it, set volume to 0 and any pause
+        // if applicable, then unpause here
+        mPanelMediaSettingsGeneral->updateMediaPreview();
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 void LLFloaterMediaSettings::onClose(bool app_quitting)
 {

indra/newview/llfloatermediasettings.h

@@ -42,6 +42,7 @@ public:
 	~LLFloaterMediaSettings();
 
 	/*virtual*/ BOOL postBuild();
+    /*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ void onClose(bool app_quitting);
 
 	static LLFloaterMediaSettings* getInstance();

indra/newview/llfloatertools.h

@@ -45,7 +45,6 @@ class LLRadioGroup;
 class LLSlider;
 class LLTabContainer;
 class LLTextBox;
-class LLMediaCtrl;
 class LLTool;
 class LLParcelSelection;
 class LLObjectSelection;
@@ -104,11 +103,6 @@ public:
 	static void setEditTool(void* data);
 	void setTool(const LLSD& user_data);
 	void saveLastTool();
-	void onClickBtnDeleteMedia();
-	void onClickBtnAddMedia();
-	void onClickBtnEditMedia();
-	void clearMediaSettings();
-	bool selectedMediaEditable();
 	void updateLandImpacts();
 
 	static void setGridMode(S32 mode);
@@ -120,13 +114,6 @@ public:
 
 private:
 	void refresh();
-	void refreshMedia();
-	void getMediaState();
-	void updateMediaSettings();
-	void navigateToTitleMedia( const std::string url ); // navigate if changed
-	void updateMediaTitle();
-	static bool deleteMediaConfirm(const LLSD& notification, const LLSD& response);
-	static bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response);
 	static void setObjectType( LLPCode pcode );
 	void onClickGridOptions();
 
@@ -218,9 +205,6 @@ public:
 	LLParcelSelectionHandle	mParcelSelection;
 	LLObjectSelectionHandle	mObjectSelection;
 
-	LLMediaCtrl				*mTitleMedia;
-	bool					mNeedMediaTitle;
-
 private:
 	BOOL					mDirty;
 	BOOL                    mHasSelection;
@@ -231,10 +215,6 @@ private:
 	S32					mExpandedHeight;
 	std::map<std::string, std::string> mStatusText;
 
-
-protected:
-	LLSD				mMediaSettings;
-
 public:
 	static bool		sShowObjectCost;
 	static bool		sPreviousFocusOnAvatar;

indra/newview/llfloaterurlentry.cpp

@@ -112,16 +112,6 @@ void LLFloaterURLEntry::headerFetchComplete(S32 status, const std::string& mime_
 		panel_media->setMediaType(mime_type);
 		panel_media->setMediaURL(mMediaURLEdit->getValue().asString());
 	}
-	else
-	{
-		LLPanelFace* panel_face = dynamic_cast<LLPanelFace*>(mPanelLandMediaHandle.get());
-		if(panel_face)
-		{
-			panel_face->setMediaType(mime_type);
-			panel_face->setMediaURL(mMediaURLEdit->getValue().asString());
-		}
-
-	}
 
 	getChildView("loading_label")->setVisible( false);
 	closeFloater();

indra/newview/llpanelface.h

@@ -48,6 +48,7 @@ class LLUICtrl;
 class LLViewerObject;
 class LLFloater;
 class LLMaterialID;
+class LLMediaCtrl;
 
 // Represents an edit for use in replicating the op across one or more materials in the selection set.
 //
@@ -98,10 +99,12 @@ public:
 	virtual ~LLPanelFace();
 
 	void			refresh();
-	void			setMediaURL(const std::string& url);
-	void			setMediaType(const std::string& mime_type);
+    void			refreshMedia();
+    void			unloadMedia();
 	void			changePrecision(S32 decimal_precision);	// <FS:CR> Adjustable decimal precision
 
+    /*virtual*/ void draw();
+
 	LLMaterialPtr createDefaultMaterial(LLMaterialPtr current_material)
 	{
 		LLMaterialPtr new_material(!current_material.isNull() ? new LLMaterial(current_material->asLLSD()) : new LLMaterial());
@@ -116,6 +119,12 @@ public:
 	LLRender::eTexIndex getTextureChannelToEdit();
 
 protected:
+    void			navigateToTitleMedia(const std::string url);
+    bool			selectedMediaEditable();
+    void			clearMediaSettings();
+    void			updateMediaSettings();
+    void			updateMediaTitle();
+
 	void			getState();
 
 	void			sendTexture();			// applies and sends texture
@@ -142,6 +151,9 @@ protected:
 	void 	onCommitNormalTexture(const LLSD& data);
 	void 	onCancelNormalTexture(const LLSD& data);
 	void 	onSelectNormalTexture(const LLSD& data);
+    void 	onClickBtnEditMedia();
+    void 	onClickBtnDeleteMedia();
+    void 	onClickBtnAddMedia();
 	void 	onCommitColor(const LLSD& data);
 	void 	onCommitShinyColor(const LLSD& data);
 	void 	onCommitAlpha(const LLSD& data);
@@ -152,6 +164,9 @@ protected:
 
 	void 	onCloseTexturePicker(const LLSD& data);
 
+    static bool deleteMediaConfirm(const LLSD& notification, const LLSD& response);
+    static bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response);
+
 	// Make UI reflect state of currently selected material (refresh)
 	// and UI mode (e.g. editing normal map v diffuse map)
 	//
@@ -277,7 +292,6 @@ private:
 	LLColorSwatchCtrl*	mShinyColorSwatch;
 	
 	LLComboBox*		mComboTexGen;
-	LLComboBox*		mComboMatMedia;
 	LLRadioGroup*	mRadioMatType;
 	
 	LLCheckBoxCtrl	*mCheckFullbright;
@@ -289,6 +303,10 @@ private:
 	LLSpinCtrl*		mCtrlRpt;
 	// </FS:CR>
 
+    LLComboBox *mComboMatMedia;
+    LLMediaCtrl *mTitleMedia;
+    LLTextBox *mTitleMediaText;
+
 	// Update visibility of controls to match current UI mode
 	// (e.g. materials vs media editing)
 	//
@@ -472,6 +490,9 @@ private:
 	bool mUpdateInFlight;
 	bool mUpdatePending;
 
+    LLSD mMediaSettings;
+    bool mNeedMediaTitle;
+
 public:
 	#if defined(DEF_GET_MAT_STATE)
 		#undef DEF_GET_MAT_STATE

indra/newview/llpanelmediasettingsgeneral.cpp

@@ -98,9 +98,6 @@ BOOL LLPanelMediaSettingsGeneral::postBuild()
 	childSetCommitCallback( LLMediaEntry::HOME_URL_KEY, onCommitHomeURL, this);
 	childSetCommitCallback( "current_url_reset_btn",onBtnResetCurrentUrl, this);
 
-	// interrogates controls and updates widgets as required
-	updateMediaPreview();
-
 	return true;
 }
 
@@ -313,9 +310,6 @@ void LLPanelMediaSettingsGeneral::initValues( void* userdata, const LLSD& _media
 			data_set[ i ].ctrl_ptr->setTentative( media_settings[ tentative_key ].asBoolean() );
 		};
 	};
-
-	// interrogates controls and updates widgets as required
-	self->updateMediaPreview();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

indra/newview/llviewerobjectlist.cpp

@@ -614,7 +614,8 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
         
 		if(update_cache)
 		{
-			objectp = regionp->updateCacheEntry(local_id, objectp, update_type);
+            //update object cache if the object receives a full-update or terse update
+			objectp = regionp->updateCacheEntry(local_id, objectp);
 		}
 
 		// This looks like it will break if the local_id of the object doesn't change

indra/newview/llviewerregion.cpp

@@ -1845,13 +1845,8 @@ LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry)
 
 //update object cache if the object receives a full-update or terse update
 //update_type == EObjectUpdateType::OUT_TERSE_IMPROVED or EObjectUpdateType::OUT_FULL
-LLViewerObject* LLViewerRegion::updateCacheEntry(U32 local_id, LLViewerObject* objectp, U32 update_type)
+LLViewerObject* LLViewerRegion::updateCacheEntry(U32 local_id, LLViewerObject* objectp)
 {
-	if(objectp && update_type != (U32)OUT_TERSE_IMPROVED)
-	{
-		return objectp; //no need to access cache
-	}
-
 	LLVOCacheEntry* entry = getCacheEntry(local_id);
 	if (!entry)
 	{
@@ -1863,11 +1858,8 @@ LLViewerObject* LLViewerRegion::updateCacheEntry(U32 local_id, LLViewerObject* o
 		objectp = addNewObject(entry);
 	}
 
-	//remove from cache if terse update
-	if(update_type == (U32)OUT_TERSE_IMPROVED)
-	{
-		killCacheEntry(entry, true);
-	}
+    //remove from cache.
+    killCacheEntry(entry, true);
 
 	return objectp;
 }

indra/newview/llviewerregion.h

@@ -382,7 +382,7 @@ public:
 	void requestCacheMisses();
 	void addCacheMissFull(const U32 local_id);
 	//update object cache if the object receives a full-update or terse update
-	LLViewerObject* updateCacheEntry(U32 local_id, LLViewerObject* objectp, U32 update_type);
+	LLViewerObject* updateCacheEntry(U32 local_id, LLViewerObject* objectp);
 	void findOrphans(U32 parent_id);
 	void clearCachedVisibleObjects();
 	void dumpCache();

indra/newview/slplugin.entitlements

@@ -12,5 +12,7 @@
 	<true/>
 	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
 	<true/>
+	<key>com.apple.security.device.audio-input</key>
+	<true/>
 </dict>
 </plist>