QAR-566 maint-viewer-5-merge-2

Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release

15 files changed, 62 insertions, 60 deletions

diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 9a8b1f7537..b6892dc262 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -507,6 +507,10 @@ CLICK_ACTION_OPEN_MEDIA Used with llSetClickAction to set open-media as the defa
 [word .1, .3, .5]
 NULL_KEY			Indicates an empty key
 EOF					Indicates the last line of a notecard was read
+TEXTURE_BLANK			UUID for the "Blank" texture
+TEXTURE_DEFAULT			UUID for the "Default Media" texture
+TEXTURE_PLYWOOD			UUID for the default "Plywood" texture
+TEXTURE_TRANSPARENT		UUID for the "White - Transparent" texture
 
 # float constants
 [word .3, .1, .5]
diff --git a/indra/newview/lldrawpoolalpha.h b/indra/newview/lldrawpoolalpha.h
index 637ea25f80..ffd6284353 100644
--- a/indra/newview/lldrawpoolalpha.h
+++ b/indra/newview/lldrawpoolalpha.h
@@ -68,13 +68,10 @@ public:
 	static BOOL sShowDebugAlpha;
 
 private:
-	S32 mDiffuse;
 	LLGLSLShader* current_shader;
 	LLGLSLShader* target_shader;
 	LLGLSLShader* simple_shader;
-	LLGLSLShader* simple_lod_shader;
 	LLGLSLShader* fullbright_shader;	
-	LLGLSLShader* fullbright_lod_shader;
 };
 
 class LLDrawPoolAlphaPostWater : public LLDrawPoolAlpha
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index 74a880e010..09888ebab0 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -441,7 +441,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 		
 		perm_string = "G";
 		perm_string += overwrite_group ? "*: " : ": ";
-		perm_string += perm_string += mask_to_string(group_mask);
+		perm_string += mask_to_string(group_mask);
 		childSetText("GroupMaskDebug",perm_string);
 		childSetVisible("GroupMaskDebug",TRUE);
 		
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 7f9dae8a64..7110ea4f93 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -327,6 +327,7 @@ void LLPanelPermissions::refresh()
 
 	// update group text field
 	childSetEnabled("Group:",true);
+	childSetText("Group Name",LLString::null);
 	LLUUID group_id;
 	BOOL groups_identical = LLSelectMgr::getInstance()->selectGetGroup(group_id);
 	if (groups_identical)
@@ -337,6 +338,16 @@ void LLPanelPermissions::refresh()
 			mLabelGroupName->setEnabled(TRUE);
 		}
 	}
+	else
+	{
+		if(mLabelGroupName)
+		{
+			mLabelGroupName->setNameID(LLUUID::null, TRUE);
+			mLabelGroupName->refresh(LLUUID::null, "", "", TRUE);
+			mLabelGroupName->setEnabled(FALSE);
+		}
+	}
+	
 	childSetEnabled("button set group",owners_identical && (mOwnerID == gAgent.getID()));
 
 	// figure out the contents of the name, description, & category
@@ -854,7 +865,7 @@ void callback_deed_to_group(S32 option, void*)
 	{
 		LLUUID group_id;
 		BOOL groups_identical = LLSelectMgr::getInstance()->selectGetGroup(group_id);
-		if(groups_identical && (gAgent.hasPowerInGroup(group_id, GP_OBJECT_DEED)))
+		if(group_id.notNull() && groups_identical && (gAgent.hasPowerInGroup(group_id, GP_OBJECT_DEED)))
 		{
 			LLSelectMgr::getInstance()->sendOwner(LLUUID::null, group_id, FALSE);
 //			LLViewerStats::getInstance()->incStat(LLViewerStats::ST_RELEASE_COUNT);
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 179b1469ed..9d7f183807 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -2510,11 +2510,7 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& result_id)
 			}
 		}
 	}
-	if (first_id.isNull())
-	{
-		return FALSE;
-	}
-	
+
 	result_id = first_id;
 
 	return identical;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index c4cd7a3a3d..f7b9d2dc93 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -401,8 +401,8 @@ void handle_duplicate_in_place(void*);
 void handle_repeat_duplicate(void*);
 
 void handle_export(void*);
-void handle_deed_object_to_group(void*);
-BOOL enable_deed_object_to_group(void*);
+// void handle_deed_object_to_group(void*);
+// BOOL enable_deed_object_to_group(void*);
 void handle_object_owner_self(void*);
 void handle_object_owner_permissive(void*);
 void handle_object_lock(void*);
@@ -3498,6 +3498,7 @@ void handle_repeat_duplicate(void*)
 	LLSelectMgr::getInstance()->repeatDuplicate();
 }
 
+/* dead code 30-apr-2008
 void handle_deed_object_to_group(void*)
 {
 	LLUUID group_id;
@@ -3523,6 +3524,8 @@ BOOL enable_deed_object_to_group(void*)
 	return FALSE;
 }
 
+*/
+
 
 /*
  * No longer able to support viewer side manipulations in this way
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index 07fc1ece73..1ef721e918 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -194,11 +194,13 @@ inline void color_gamma_correct(LLColor3 &col)
 
 S32 LLSkyTex::sComponents = 4;
 S32 LLSkyTex::sResolution = 64;
-F32	LLSkyTex::sInterpVal = 0.f;
+F32 LLSkyTex::sInterpVal = 0.f;
 S32 LLSkyTex::sCurrent = 0;
 
 
-LLSkyTex::LLSkyTex()
+LLSkyTex::LLSkyTex() :
+	mSkyData(NULL),
+	mSkyDirs(NULL)
 {
 }
 
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h
index 260aeeada7..c2ab9ae6a4 100644
--- a/indra/newview/llvosky.h
+++ b/indra/newview/llvosky.h
@@ -207,7 +207,7 @@ protected:
 	F32				mDiskRadius;
 	BOOL			mDraw;					// FALSE - do not draw.
 	F32				mHorizonVisibility;		// number [0, 1] due to how horizon
-	F32				mVisibility;			// same but due to other objects being in frong.
+	F32				mVisibility;			// same but due to other objects being in throng.
 	BOOL			mVisible;
 	static F32		sInterpVal;
 	LLVector3		mQuadCorner[4];
@@ -217,10 +217,12 @@ protected:
 
 public:
 	LLHeavenBody(const F32 rad) :
-			mDirectionCached(LLVector3(0,0,0)), mDirection(LLVector3(0,0,0)),
-			mDiskRadius(rad), mDraw(FALSE),
-			mHorizonVisibility(1), mVisibility(1)
-
+		mDirectionCached(LLVector3(0,0,0)),
+		mDirection(LLVector3(0,0,0)),
+		mIntensity(0.f),
+		mDiskRadius(rad), mDraw(FALSE),
+		mHorizonVisibility(1.f), mVisibility(1.f),
+		mVisible(FALSE)
 	{
 		mColor.setToBlack();
 		mColorCached.setToBlack();
@@ -261,7 +263,6 @@ public:
 	BOOL isVisible() const								{ return mVisible; }
 	void setVisible(const BOOL v)						{ mVisible = v; }
 
-
 	const F32& getIntensity() const						{ return mIntensity; }
 	void setIntensity(const F32 c)						{ mIntensity = c; }
 
@@ -311,19 +312,19 @@ LL_FORCE_INLINE LLColor3 calc_air_sca_sea_level()
 
 const LLColor3 gAirScaSeaLevel = calc_air_sca_sea_level();
 const F32 AIR_SCA_INTENS = color_intens(gAirScaSeaLevel);	
-const F32 AIR_SCA_AVG = AIR_SCA_INTENS / 3;	
+const F32 AIR_SCA_AVG = AIR_SCA_INTENS / 3.f;
 
 class LLHaze
 {
 public:
-	LLHaze() : mG(0), mFalloff(1) {mSigSca.setToBlack();}
-	LLHaze(const F32 g, const LLColor3& sca, const F32 fo = 2) : 
-			mG(g), mSigSca(0.25f/F_PI * sca), mFalloff(fo), mAbsCoef(0)
+	LLHaze() : mG(0), mFalloff(1), mAbsCoef(0.f) {mSigSca.setToBlack();}
+	LLHaze(const F32 g, const LLColor3& sca, const F32 fo = 2.f) : 
+			mG(g), mSigSca(0.25f/F_PI * sca), mFalloff(fo), mAbsCoef(0.f)
 	{
 		mAbsCoef = color_intens(mSigSca) / AIR_SCA_INTENS;
 	}
 
-	LLHaze(const F32 g, const F32 sca, const F32 fo = 2) : mG(g),
+	LLHaze(const F32 g, const F32 sca, const F32 fo = 2.f) : mG(g),
 			mSigSca(0.25f/F_PI * LLColor3(sca, sca, sca)), mFalloff(fo)
 	{
 		mAbsCoef = 0.01f * sca / AIR_SCA_AVG;
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index 1697717609..6cc7e603a6 100644
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -75,7 +75,8 @@ LLWaterParamManager::LLWaterParamManager() :
 	mBlurMultiplier(0.1f, "blurMultiplier"),
 	mWave1Dir(.5f, .5f, "wave1Dir"),
 	mWave2Dir(.5f, .5f, "wave2Dir"),
-	mDensitySliderValue(1.0f)
+	mDensitySliderValue(1.0f),
+	mWaterFogKS(1.0f)
 {
 }
 
@@ -255,8 +256,8 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
 	if(gPipeline.canUseVertexShaders()) 
 	{
 		//transform water plane to eye space
-		glh::vec3f norm(0, 0, 1);
-		glh::vec3f p(0, 0, gAgent.getRegion()->getWaterHeight()+0.1f);
+		glh::vec3f norm(0.f, 0.f, 1.f);
+		glh::vec3f p(0.f, 0.f, gAgent.getRegion()->getWaterHeight()+0.1f);
 		
 		F32 modelView[16];
 		for (U32 i = 0; i < 16; i++)
diff --git a/indra/newview/llwaterparammanager.h b/indra/newview/llwaterparammanager.h
index 6892bb1924..937dd9e388 100644
--- a/indra/newview/llwaterparammanager.h
+++ b/indra/newview/llwaterparammanager.h
@@ -315,18 +315,16 @@ public:
 	F32 mDensitySliderValue;
 
 private:
-	// our parameter manager singleton instance
-	static LLWaterParamManager * sInstance;
-
-private:
-
 	LLVector4 mWaterPlane;
 	F32 mWaterFogKS;
+
+	// our parameter manager singleton instance
+	static LLWaterParamManager * sInstance;
 };
 
 inline void LLWaterParamManager::setDensitySliderValue(F32 val)
 {
-	val /= 10;
+	val /= 10.0f;
 	val = 1.0f - val;
 	val *= val * val;
 //	val *= val;
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index 68e402abdb..ea960b39cd 100644
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -299,7 +299,7 @@ void LLWLParamManager::propagateParameters(void)
 	LLVector4 sunDir;
 	LLVector4 moonDir;
 
-	// set the sun direction from mSunAngle and mEastAngle
+	// set the sun direction from SunAngle and EastAngle
 	F32 sinTheta = sin(mCurParams.getEastAngle());
 	F32 cosTheta = cos(mCurParams.getEastAngle());
 
diff --git a/indra/newview/llwlparammanager.h b/indra/newview/llwlparammanager.h
index a78d92bf8b..474db19cfa 100644
--- a/indra/newview/llwlparammanager.h
+++ b/indra/newview/llwlparammanager.h
@@ -199,8 +199,6 @@ public:
 public:
 
 	// helper variables
-	F32 mSunAngle;
-	F32 mEastAngle;
 	LLWLAnimator mAnimator;
 
 	/// actual direction of the sun
@@ -217,9 +215,6 @@ public:
 	// list of params and how they're cycled for days
 	LLWLDayCycle mDay;
 
-	// length of the day in seconds
-	F32 mLengthOfDay;
-
 	LLWLParamSet mCurParams;
 
 	/// Sun Delta Terrain tweak variables.
diff --git a/indra/newview/llwlparamset.h b/indra/newview/llwlparamset.h
index 1f72fffdfc..fe075ece9a 100644
--- a/indra/newview/llwlparamset.h
+++ b/indra/newview/llwlparamset.h
@@ -132,18 +132,10 @@ public:
 	/// get the star brightness value;
 	F32 getStarBrightness();	
 	
-	/// set the star's brightness
-	/// \param val brightness value
 	void setSunAngle(F32 val);
-	
-	/// get the star brightness value;
 	F32 getSunAngle();	
 	
-	/// set the star's brightness
-	/// \param val brightness value
 	void setEastAngle(F32 val);
-	
-	/// get the star brightness value;
 	F32 getEastAngle();	
 	
 							
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index e45b929b6f..e2463adde3 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -83,22 +83,25 @@ const F32 LLWorld::mWidthInMeters = mWidth * mScale;
 //
 
 // allocate the stack
-LLWorld::LLWorld()
+LLWorld::LLWorld() :
+	mLandFarClip(DEFAULT_FAR_PLANE),
+	mLastPacketsIn(0),
+	mLastPacketsOut(0),
+	mLastPacketsLost(0),
+	mMinRegionX(0),
+	mMaxRegionX(0),
+	mMinRegionY(0),
+	mMaxRegionY(0),
+	mSpaceTimeUSec(0)
 {
-	mSpaceTimeUSec = 0;
-	mLastPacketsIn = 0;
-	mLastPacketsOut = 0;
-	mLastPacketsLost = 0;
-	mLandFarClip = DEFAULT_FAR_PLANE;
-
-	if (gNoRender)
+	for (S32 i = 0; i < 8; i++)
 	{
-		return;
+		mEdgeWaterObjects[i] = NULL;
 	}
 
-	for (S32 i = 0; i < 8; i++)
+	if (gNoRender)
 	{
-		mEdgeWaterObjects[i] = NULL;
+		return;
 	}
 
 	LLPointer<LLImageRaw> raw = new LLImageRaw(1,1,4);
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0fbd177da4..f0497d2574 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -508,7 +508,6 @@ class Linux_i686Manifest(LinuxManifest):
                         self.path("libdb-4.2.so")
                         self.path("libcrypto.so.0.9.7")
                         self.path("libssl.so.0.9.7")
-                        self.path("libexpat.so.1")
                         self.path("libstdc++.so.6")
                         self.path("libuuid.so", "libuuid.so.1")
                         self.path("libSDL-1.2.so.0")