merge from viewer2.

7 files changed, 40 insertions, 27 deletions

diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h
index 6a2b7fc218..b947943619 100644
--- a/indra/newview/lldrawpoolavatar.h
+++ b/indra/newview/lldrawpoolavatar.h
@@ -39,8 +39,6 @@ class LLVOAvatar;
 
 class LLDrawPoolAvatar : public LLFacePool
 {
-protected:
-	S32					mNumFaces;
 public:
 	enum
 	{
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp
index 8428be194f..0f76165053 100644
--- a/indra/newview/lldrawpoolsky.cpp
+++ b/indra/newview/lldrawpoolsky.cpp
@@ -48,8 +48,11 @@
 #include "pipeline.h"
 #include "llviewershadermgr.h"
 
-LLDrawPoolSky::LLDrawPoolSky() :
-	LLFacePool(POOL_SKY), mShader(NULL)
+LLDrawPoolSky::LLDrawPoolSky()
+:	LLFacePool(POOL_SKY),
+	
+	mSkyTex(NULL),
+	mShader(NULL)
 {
 }
 
@@ -132,6 +135,7 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side)
 		return;
 	}
 
+	llassert(mSkyTex);
 	mSkyTex[side].bindTexture(TRUE);
 	
 	face.renderIndexed();
diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h
index 68a8172dd0..614f645243 100644
--- a/indra/newview/lldrawpoolwater.h
+++ b/indra/newview/lldrawpoolwater.h
@@ -47,7 +47,6 @@ protected:
 	LLPointer<LLViewerTexture> mWaterImagep;
 	LLPointer<LLViewerTexture> mWaterNormp;
 
-	const LLWaterSurface *mWaterSurface;
 public:
 	static BOOL sSkipScreenCopy;
 	static BOOL sNeedsReflectionUpdate;
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h
index 383963a41d..dd218d428f 100644
--- a/indra/newview/llfeaturemanager.h
+++ b/indra/newview/llfeaturemanager.h
@@ -99,8 +99,14 @@ protected:
 class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManager>
 {
 public:
-	LLFeatureManager() :
-		LLFeatureList("default"), mInited(FALSE), mTableVersion(0), mSafe(FALSE), mGPUClass(GPU_CLASS_UNKNOWN)
+	LLFeatureManager()
+	:	LLFeatureList("default"),
+
+		mInited(FALSE),
+		mTableVersion(0),
+		mSafe(FALSE),
+		mGPUClass(GPU_CLASS_UNKNOWN),
+		mGPUSupported(FALSE)
 	{
 	}
 	~LLFeatureManager() {cleanupFeatureTables();}
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 39e71974fd..bf1e307d71 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -910,16 +910,19 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
 				tooltip_msg.append( nodep->mName );
 			}
 			
+			bool has_media = false;
 			bool is_time_based_media = false;
 			bool is_web_based_media = false;
 			bool is_media_playing = false;
+			bool is_media_displaying = false;
 			
 			// Does this face have media?
 			const LLTextureEntry* tep = hover_object->getTE(mHoverPick.mObjectFace);
 			
 			if(tep)
 			{
-				const LLMediaEntry* mep = tep->hasMedia() ? tep->getMediaData() : NULL;
+				has_media = tep->hasMedia();
+				const LLMediaEntry* mep = has_media ? tep->getMediaData() : NULL;
 				if (mep)
 				{
 					viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID());
@@ -927,33 +930,38 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
 					
 					if (media_impl.notNull() && (media_impl->hasMedia()))
 					{
+						is_media_displaying = true;
 						LLStringUtil::format_map_t args;
 						
 						media_plugin = media_impl->getMediaPlugin();
 						if(media_plugin)
-						{	if(media_plugin->pluginSupportsMediaTime())
-						{
-							is_time_based_media = true;
-							is_web_based_media = false;
-							//args["[CurrentURL]"] =  media_impl->getMediaURL();
-							is_media_playing = media_impl->isMediaPlaying();
-						}
-						else
-						{
-							is_time_based_media = false;
-							is_web_based_media = true;
-							//args["[CurrentURL]"] =  media_plugin->getLocation();
-						}
+						{	
+							if(media_plugin->pluginSupportsMediaTime())
+							{
+								is_time_based_media = true;
+								is_web_based_media = false;
+								//args["[CurrentURL]"] =  media_impl->getMediaURL();
+								is_media_playing = media_impl->isMediaPlaying();
+							}
+							else
+							{
+								is_time_based_media = false;
+								is_web_based_media = true;
+								//args["[CurrentURL]"] =  media_plugin->getLocation();
+							}
 							//tooltip_msg.append(LLTrans::getString("CurrentURL", args));
 						}
 					}
 				}
 			}
 			
+			// Avoid showing tip over media that's displaying
 			// also check the primary node since sometimes it can have an action even though
 			// the root node doesn't
-			bool needs_tip = needs_tooltip(nodep) || 
-			needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode());
+			bool needs_tip = !is_media_displaying &&
+				(has_media || 
+				 needs_tooltip(nodep) || 
+				 needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode()));
 			
 			if (show_all_object_tips || needs_tip)
 			{
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 7b28a3b72c..f7ac5361c5 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -56,9 +56,9 @@ void LLLogin::disconnect()
 
 //-----------------------------------------------------------------------------
 #include "../llviewernetwork.h"
-unsigned char gMACAddress[MAC_ADDRESS_BYTES] = {'1','2','3','4','5','6'};		/* Flawfinder: ignore */
+unsigned char gMACAddress[MAC_ADDRESS_BYTES] = {'1','2','3','4','5','6'};
 
-LLViewerLogin::LLViewerLogin() {}
+LLViewerLogin::LLViewerLogin() : mGridChoice(GRID_INFO_NONE) {}
 LLViewerLogin::~LLViewerLogin() {}
 void LLViewerLogin::getLoginURIs(std::vector<std::string>& uris) const 
 {
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index 297d98ad8d..dd61ac6ae5 100644
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -87,8 +87,6 @@ public:
 	__attribute__ ((noinline))
 #endif
 	BOOL isGodlike() const { return FALSE; }
-private:
-	int dummy;
 };
 LLAgent gAgent;