diff options
| author | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:31 +0000 |
|---|---|---|
| committer | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:31 +0000 |
| commit | c173b07b72ac3e30c019cbee8dba53401c781be3 (patch) | |
| tree | 6267b828141028889894be919263c6d19c6e54c1 /indra/newview/llviewermessage.cpp | |
| parent | 3efd4c50a031ce0c1cb3d2fcc43e403136277e1f (diff) | |
| parent | ba3459f77fc9b93c8dd79bc3ac7c59ba792da27f (diff) | |
Merged in SL-15999 (pull request #746)
SL-15999 support --noninteractive option for viewer
Approved-by: Dave Parks
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 94d2d216b9..5e99d13206 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2423,6 +2423,10 @@ void translateFailure(LLChat chat, LLSD toastArgs, int status, const std::string void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) { + if (gNonInteractive) + { + return; + } LLChat chat; std::string mesg; std::string from_name; |