diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
| commit | 5c73a908353cdd7210e3148f7162d30afab7873a (patch) | |
| tree | 3ff858042b69b20a9eb3062b7cabd0c390e1b5cf /indra/newview/tests | |
| parent | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (diff) | |
| parent | 5eee046bb7d62e24df6c35018b3c5383f87ab587 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/tests/llviewerhelputil_test.cpp | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index f4d9cc99cc..459885e4ac 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -75,7 +75,6 @@ LLSD LLCredential::getLoginParams() //----------------------------------------------------------------------------- #include "../llviewernetwork.h" - LLGridManager::~LLGridManager() { } 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; |