summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-01-11 16:32:47 -0800
committerRichard Linden <none@none>2013-01-11 16:32:47 -0800
commite0f2c608cf2bc724b7cb4a4443bb6a04c7069bf5 (patch)
tree923391e3fee69b7302f9c043f5ea0261e5146f02 /indra/newview/llvoavatar.cpp
parent91a8383b4a0bbd2d48d2d84678f5bcc3701c2b9f (diff)
parentca21e13667a09a8ecdf1468995e38622867e907e (diff)
Automated merge with file:///c:%5Ccode%5Cviewer-interesting-metrics
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-xindra/newview/llvoavatar.cpp6
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