diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-18 17:27:36 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-18 17:27:36 +0100 |
| commit | 8d1aa99e80f7354af4810e563649ca1ee31f2e1a (patch) | |
| tree | 5ce8a88442e40be9ad582000b8d2bf2cab59b18f /indra/llcommon/llsdutil.cpp | |
| parent | cef702d0c57e5bb4f0debfba677d1fd5a9694364 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge remote-tracking branch 'origin/master' into SL-13705
Diffstat (limited to 'indra/llcommon/llsdutil.cpp')
| -rw-r--r-- | indra/llcommon/llsdutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp index d44387cc55..3f3edb661f 100644 --- a/indra/llcommon/llsdutil.cpp +++ b/indra/llcommon/llsdutil.cpp @@ -506,7 +506,7 @@ struct Data const char* name; } typedata[] = { -#define def(type) { LLSD::type, #type + 4 } +#define def(type) { LLSD::type, &#type[4] } def(TypeUndefined), def(TypeBoolean), def(TypeInteger), |