diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-07-30 14:57:33 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-07-30 14:57:33 -0400 |
| commit | a5c9d89b28d74c1996a0c950a0c8b1484b43d243 (patch) | |
| tree | afd2dc64d86c69390fe2f482870fae0b097b768a /indra/newview/llappviewer.cpp | |
| parent | 0f3c5e6458acdf1676f0b7a6dc42ed8cfa286cb0 (diff) | |
| parent | d306cb059b9b56c1eb051074e19796b47e1c262d (diff) | |
merge
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 efa24796e5..6a4f6e4a02 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4338,6 +4338,10 @@ void LLAppViewer::idle() { return; } + if (gTeleportDisplay) + { + return; + } gViewerWindow->updateUI(); |