diff options
| author | Richard Linden <none@none> | 2013-01-10 00:12:57 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-10 00:12:57 -0800 |
| commit | e28007f830a85b94adb7b787f18047780ac026ff (patch) | |
| tree | 2f72c0a29dadea66d95ac7ac6646b93311b85a9c /indra/newview/llvoavatar.cpp | |
| parent | 8c73ff245cee8da2ca75c5651be88a36358a5dae (diff) | |
| parent | beb431c7834f49d8e6b5304f7b60fb1f1b3b4afe (diff) | |
Automated merge with file:///d:%5Ccode%5Cviewer-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 |