diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2016-10-12 10:47:26 +0000 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2016-10-12 10:47:26 +0000 |
commit | 67c24d933b2aaebadcb86878b4cadf28ce719f56 (patch) | |
tree | b7d68362ad2cdd8d360d33d099faa33bb451d757 /indra/llcommon/tests/llerror_test.cpp | |
parent | 71661a02661adc9eebaa15863269db621c816088 (diff) | |
parent | 86be29fe80af4bc49c31636cb5b7cc21ac100427 (diff) |
Merged in lindenlab/viewer-bear-maint-6633 (pull request #23)
Default
Diffstat (limited to 'indra/llcommon/tests/llerror_test.cpp')
-rw-r--r-- | indra/llcommon/tests/llerror_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 8bace8ac41..20de205454 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -564,9 +564,9 @@ namespace tut function; writeReturningLocationAndFunction(location, function); - ensure_equals("order is location time type function message", + ensure_equals("order is time location type function message", message(0), - location + roswell() + " INFO: " + function + ": apple"); + roswell() + " INFO: " + location + function + ": apple"); } template<> template<> |