diff options
| author | Callum Linden <callum@lindenlab.com> | 2021-09-28 15:25:12 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2021-09-28 15:25:12 -0700 |
| commit | 89057746316affe2fef7314624942fa43085d6b6 (patch) | |
| tree | 6187d3d751c13f46b571b10908e5d56f3febff94 /indra/newview/llagent.cpp | |
| parent | 851fef680164e3472b0516e7237bbcc4a35bc5a3 (diff) | |
| parent | 187d5862398820e28a8935ce9058f444f4963153 (diff) | |
Merge branch 'SL-15999' of https://bitbucket.org/lindenlab/viewer into SL-15999
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; |