diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:36:10 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:36:10 +0300 |
| commit | 6bd9fe423325a4166110ae944e3ba79482a6a937 (patch) | |
| tree | 5dc36870d9209352885cc127c6ad4a2605b051ff /indra/newview/llagentcamera.cpp | |
| parent | f2d7be71842de8158926e181833cae086fd9e8b7 (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
Merge branch 'master' into DRTVWR-497
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 8edb1a5f0b..85b7d7b06f 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -282,6 +282,11 @@ LLAgentCamera::~LLAgentCamera() //----------------------------------------------------------------------------- void LLAgentCamera::resetView(BOOL reset_camera, BOOL change_camera) { + if (gDisconnected) + { + return; + } + if (gAgent.getAutoPilot()) { gAgent.stopAutoPilot(TRUE); |