diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 16:09:11 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 16:09:11 -0800 |
| commit | 6d9713e8ed691882180c85e60070d80e1e3eed5e (patch) | |
| tree | a9737f254ef00900ec40120b020621ad64e198c3 /indra/newview/tests | |
| parent | 0bb7a85d06e7201887962000cb3e91bf456ffa09 (diff) | |
| parent | 682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff) | |
merge from viewer2.
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; |