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/llagent.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/llagent.cpp')
-rw-r--r-- | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 389448654a..b35eef20f7 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1481,7 +1481,7 @@ void LLAgent::resetControlFlags() //----------------------------------------------------------------------------- void LLAgent::setAFK() { - if (!gAgent.getRegion()) + if (gNonInteractive || !gAgent.getRegion()) { // Don't set AFK if we're not talking to a region yet. return; |