summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-11 17:36:23 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-11 17:36:23 -0700
commitf9e900f5ac9002f5ef3b44b02ac300971288e89b (patch)
tree091238cd0560d87e1213433966debf0e60c0775b /indra/newview/llappviewer.cpp
parenta90a4b7b99b383490e594e2cdf1181d13e0c0f06 (diff)
* New floater positioning code. Better than what's checked in but not great.
* Floater updates for positioning and to revert some earlier string changes.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5077a0a596..2a9e411762 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4293,12 +4293,15 @@ void LLAppViewer::idle()
return;
}
- gViewerWindow->updateUI();
+ if (!quitRequested())
+ {
+ gViewerWindow->updateUI();
+ }
///////////////////////////////////////
// Agent and camera movement
//
- LLCoordGL current_mouse = gViewerWindow->getCurrentMouse();
+ LLCoordGL current_mouse = gViewerWindow->getCurrentMouse();
{
// After agent and camera moved, figure out if we need to