diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-24 14:02:51 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-24 14:02:51 +0200 |
| commit | 1ef3fed827d7bcc901fc6e000033e45925f09b5c (patch) | |
| tree | 7f282a0b2b828ea5f04d6c62b513c022f4071a1b /indra/newview/llagent.cpp | |
| parent | 172d9b21ab26927ec35a9210c4e9ce2ec24c9509 (diff) | |
| parent | a7bca7055adbceee0fe09a6078158ffe8d0eacef (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 3675be16e9..afd9d7b3f9 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3018,6 +3018,9 @@ void LLAgent::endAnimationUpdateUI() //----------------------------------------------------------------------------- void LLAgent::updateCamera() { + static LLFastTimer::DeclareTimer ftm("Camera"); + LLFastTimer t(ftm); + //Ventrella - changed camera_skyward to the new global "mCameraUpVector" mCameraUpVector = LLVector3::z_axis; //LLVector3 camera_skyward(0.f, 0.f, 1.f); |