diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-01 16:32:16 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-01 16:32:16 +0200 |
| commit | bf6d1713ec71ca88daf0f19c6d444b82ba2ccad2 (patch) | |
| tree | eaf444acb6a27e76ac0bb1723f0f9853e8980f7b /indra/newview/tests | |
| parent | 3650ef0d9ff937aeb1081817158021adb3f081d2 (diff) | |
| parent | 379762d2c1dd4e0804dd6ab1b930f525e1a60189 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/tests/llviewerhelputil_test.cpp | 2 |
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; |