summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercamera.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewercamera.cpp')
-rw-r--r--indra/newview/llviewercamera.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
index 8657f59ccb..a1a2c34222 100644
--- a/indra/newview/llviewercamera.cpp
+++ b/indra/newview/llviewercamera.cpp
@@ -47,6 +47,8 @@
#include "llviewerwindow.h"
#include "llvovolume.h"
#include "llworld.h"
+#include "lltoolmgr.h"
+#include "llviewerjoystick.h"
GLfloat gGLZFar;
GLfloat gGLZNear;
@@ -97,6 +99,13 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
const LLVector3 &up_direction,
const LLVector3 &point_of_interest)
{
+ // do not update if we are in build mode AND avatar didn't move
+ if (LLToolMgr::getInstance()->inBuildMode()
+ && !LLViewerJoystick::getInstance()->getCameraNeedsUpdate())
+ {
+ return;
+ }
+
LLVector3 last_position;
LLVector3 last_axis;
last_position = getOrigin();