diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2016-10-11 14:42:58 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2016-10-11 14:42:58 -0700 |
| commit | 86be29fe80af4bc49c31636cb5b7cc21ac100427 (patch) | |
| tree | aa9a518421ec0b5c865203034468dcbe4d6fe148 /indra/llcommon/tests | |
| parent | 061b918deea9a07e9d3e44e18a86afefc3740898 (diff) | |
| parent | d68befaced94f1d0ef5879ab3db307f3327588ab (diff) | |
merge maint-6633 to fork of viewer-bear
Diffstat (limited to 'indra/llcommon/tests')
| -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<> |