diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-11-11 01:55:26 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-11-11 01:55:26 +0200 |
| commit | 32df877cd73b5b6a3672d0159c982077a4b67a9d (patch) | |
| tree | 3db2802f0ab39f2d7b1264e2ac1d3599f1a3bd5a /indra/test | |
| parent | eccc9057d9d9799d3d5056bdfe255bd9e5e2be6a (diff) | |
| parent | e028ae4f023420bedd4e4106f4749e700a14c3cc (diff) | |
Merge branch 'develop' into marchcat/c-develop
# Conflicts:
# indra/newview/llvoavatar.cpp
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/lltut.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/test/lltut.h b/indra/test/lltut.h index 986bdd0619..1e380a3f5e 100644 --- a/indra/test/lltut.h +++ b/indra/test/lltut.h @@ -128,7 +128,7 @@ namespace tut inline void ensure_memory_matches(const void* actual, U32 actual_len, const void* expected,U32 expected_len) { - ensure_memory_matches(NULL, actual, actual_len, expected, expected_len); + ensure_memory_matches("", actual, actual_len, expected, expected_len); } template <class T,class Q> |