diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-04 13:13:59 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-04 13:13:59 -0800 |
| commit | f7842eab6199d6d7ff2130e9395ced3e8f33f94d (patch) | |
| tree | 56a0eaacafa56f73be608e932423a9074f1bb6af /indra/llcommon | |
| parent | beda7ae971acb05e8e1dce83e8f86ae51da54ba3 (diff) | |
| parent | 5048942dbc0a0aa577625bc47d77162cbcf1afdc (diff) | |
pull from oz_linden/viewer-autobuild
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 | ||||
| -rw-r--r-- | indra/llcommon/tests/llerror_test.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 7703132d90..5a134b5009 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -28,8 +28,8 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 2; -const S32 LL_VERSION_MINOR = 7; -const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_MINOR = 5; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 1ef8fc9712..2350059626 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -48,7 +48,10 @@ namespace { static bool fatalWasCalled; void fatalCall(const std::string&) { fatalWasCalled = true; } +} +namespace tut +{ class TestRecorder : public LLError::Recorder { public: @@ -82,10 +85,7 @@ namespace bool mWantsTime; }; -} - -namespace tut -{ + struct ErrorTestData { TestRecorder mRecorder; @@ -381,7 +381,7 @@ namespace } typedef std::string (*LogFromFunction)(bool); - void testLogName(TestRecorder& recorder, LogFromFunction f, + void testLogName(tut::TestRecorder& recorder, LogFromFunction f, const std::string& class_name = "") { recorder.clearMessages(); |