Merge with default branch

--HG--
branch : product-engine

2 files changed, 2 insertions, 4 deletions

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;