diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2012-05-29 18:03:04 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2012-05-29 18:03:04 -0600 |
| commit | 1faf3d9c5ffa24747d822332233b8c29993d91fb (patch) | |
| tree | 47a7ab455665b8c62c85f7f48e80c3905c9b7c5a /indra/newview/llappviewer.cpp | |
| parent | a9ef160f4eca2c6a55e2df286c9c75a27e38a831 (diff) | |
| parent | 957bfcd5d90b4ae0dfccd7a934364461059f8402 (diff) | |
Automated merge with https://bitbucket.org/VirLinden/drano
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 178b96e42e..4fb0a7628c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4270,6 +4270,10 @@ void LLAppViewer::idle() { return; } + if (gTeleportDisplay) + { + return; + } gViewerWindow->updateUI(); |