Merge remote-tracking branch 'origin/sl-17218' into DRTVWR-543-maint

5 files changed, 7 insertions, 34 deletions

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 590c807019..7b57fbbd47 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1107,17 +1107,18 @@ Nicky Dasmijn
 	STORM-1937
 	OPEN-187
 	SL-15234
-    STORM-2010
+	STORM-2010
 	STORM-2082
 	MAINT-6665
 	SL-10291
 	SL-10293
 	SL-11061
-    SL-11072
+	SL-11072
 	SL-13141
 	SL-13642
 	SL-14541
 	SL-16438
+	SL-17218
 Nicky Perian
 	OPEN-1
 	STORM-1087
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index a4600069ce..ca72dd5fd3 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -472,32 +472,6 @@ const std::string LLTexLayerSet::getBodyRegionName() const
 	return mInfo->mBodyRegion; 
 }
 
-
-// virtual
-void LLTexLayerSet::asLLSD(LLSD& sd) const
-{
-	sd["visible"] = LLSD::Boolean(isVisible());
-	LLSD layer_list_sd;
-	layer_list_t::const_iterator layer_iter = mLayerList.begin();
-	layer_list_t::const_iterator layer_end  = mLayerList.end();
-	for(; layer_iter != layer_end; ++layer_iter);
-	{
-		LLSD layer_sd;
-		//LLTexLayerInterface* layer = (*layer_iter);
-		//if (layer)
-		//{
-		//	layer->asLLSD(layer_sd);
-		//}
-		layer_list_sd.append(layer_sd);
-	}
-	LLSD mask_list_sd;
-	LLSD info_sd;
-	sd["layers"] = layer_list_sd;
-	sd["masks"] = mask_list_sd;
-	sd["info"] = info_sd;
-}
-
-
 void LLTexLayerSet::destroyComposite()
 {
 	if( mComposite )
diff --git a/indra/llappearance/lltexlayer.h b/indra/llappearance/lltexlayer.h
index 6a5040cf0b..74b421d3ee 100644
--- a/indra/llappearance/lltexlayer.h
+++ b/indra/llappearance/lltexlayer.h
@@ -220,8 +220,6 @@ public:
 
 	static BOOL					sHasCaches;
 
-	virtual void				asLLSD(LLSD& sd) const;
-
 protected:
 	typedef std::vector<LLTexLayerInterface *> layer_list_t;
 	layer_list_t				mLayerList;
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 445615fdd5..5201a27572 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1026,12 +1026,12 @@ void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_po
 {
 	const LLMatrix4& vol_mat = getWorldMatrix();
 	const LLVolumeFace& vf = getViewerObject()->getVolume()->getVolumeFace(mTEOffset);
-	const LLVector4a& normal4a = vf.mNormals[0];
-	const LLVector4a& tangent = vf.mTangents[0];
-	if (!&tangent)
+	if (! (vf.mNormals && vf.mTangents))
 	{
 		return;
 	}
+	const LLVector4a& normal4a = *vf.mNormals;
+	const LLVector4a& tangent  = *vf.mTangents;
 
 	LLVector4a binormal4a;
 	binormal4a.setCross3(normal4a, tangent);
diff --git a/indra/newview/llpanelloginlistener.cpp b/indra/newview/llpanelloginlistener.cpp
index 33efde11f3..fb3e8dc244 100644
--- a/indra/newview/llpanelloginlistener.cpp
+++ b/indra/newview/llpanelloginlistener.cpp
@@ -47,5 +47,5 @@ LLPanelLoginListener::LLPanelLoginListener(LLPanelLogin* instance):
 
 void LLPanelLoginListener::onClickConnect(const LLSD&) const
 {
-    mPanel->onClickConnect(NULL);
+    mPanel->onClickConnect(false);
 }