diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-08 14:50:31 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-08 14:50:31 -0700 |
| commit | 8315e9745398c1c3215ffe1b3bfbfb6c7d16291d (patch) | |
| tree | 6e894381a62c0fb8656d2e0720b62d1beda3c06e /indra/newview/llvoavatar.cpp | |
| parent | 68413515029f50713c70e4adec3ce6fd1022d59f (diff) | |
| parent | 1fbd45672fcb1e5bfc194712fc7d0d4847a651cd (diff) | |
Merge
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 |