diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-18 19:16:03 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-18 19:16:03 +0300 |
| commit | cfe0ba90352c48a2b9f5006c4c8e824dc472cdc9 (patch) | |
| tree | 58515df5648b7a7819b4cb62e88431c1b4747e79 /indra/newview/llcommandhandler.cpp | |
| parent | 61e318564e5c492ff7da70ef05f9596c4af8d369 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
# indra/newview/llimprocessing.cpp
Diffstat (limited to 'indra/newview/llcommandhandler.cpp')
| -rw-r--r-- | indra/newview/llcommandhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp index 76d965b1f1..23e2271eae 100644 --- a/indra/newview/llcommandhandler.cpp +++ b/indra/newview/llcommandhandler.cpp @@ -222,7 +222,7 @@ struct symbol_info #define ent(SYMBOL) \ { \ - #SYMBOL + 28, /* skip "LLCommandHandler::UNTRUSTED_" prefix */ \ + &#SYMBOL[28], /* skip "LLCommandHandler::UNTRUSTED_" prefix */ \ SYMBOL \ } |