diff options
| author | Richard Linden <none@none> | 2013-01-10 00:55:13 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-10 00:55:13 -0800 |
| commit | 6bf1e9f585fc945ee60501e69f75a12fd7d320cb (patch) | |
| tree | b8cf0e7024c8e77bcdda93ef11682f141b21a378 /indra/newview/llvoavatar.cpp | |
| parent | 7b0762984a4c49595445ed3a5a113c3f0aa17181 (diff) | |
| parent | 2ac49344e1aea94a11ecdb07ac6043538246a2f6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f349714556..1d43f96fb7 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -102,6 +102,7 @@ #include "lldebugmessagebox.h" #include "llsdutil.h" +#include "llscenemonitor.h" extern F32 SPEED_ADJUST_MAX; extern F32 SPEED_ADJUST_MAX_SEC; @@ -771,6 +772,11 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, mLastPelvisToFoot = 0.0f; mPelvisFixup = 0.0f; mLastPelvisFixup = 0.0f; + + if(LLSceneMonitor::getInstance()->isEnabled()) + { + LLSceneMonitor::getInstance()->freezeAvatar((LLCharacter*)this); + } } std::string LLVOAvatar::avString() const |