summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-03-29 20:29:40 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-03-29 20:29:40 -0400
commita1b6e9b43861895c3baf993ba666eff7ab65131a (patch)
tree6bb8e21ac60a1e7f8d0a57a9133b26da97d35645
parentca74323ee88d44dbc0a8dbe639057e6cbc86b017 (diff)
MAINT-7166 - diagnostics for movement
-rw-r--r--indra/llcharacter/llmotioncontroller.cpp8
-rw-r--r--indra/newview/lltexturefetch.cpp4
2 files changed, 8 insertions, 4 deletions
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index d8185aa693..379667418a 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -365,6 +365,8 @@ LLMotion* LLMotionController::createMotion( const LLUUID &id )
// initialize the new instance
LLMotion::LLMotionInitStatus stat = motion->onInitialize(mCharacter);
+ // Only use this in one case, declaring here to stop compiler from whining.
+ LLKeyframeMotion *keymotion = NULL;
switch(stat)
{
case LLMotion::STATUS_FAILURE:
@@ -378,6 +380,12 @@ LLMotion* LLMotionController::createMotion( const LLUUID &id )
case LLMotion::STATUS_SUCCESS:
// add motion to our list
mLoadedMotions.insert(motion);
+ keymotion = dynamic_cast<LLKeyframeMotion*>(motion);
+ if (keymotion)
+ {
+ std::string noname;
+ keymotion->dumpToFile(noname);
+ }
break;
default:
LL_ERRS() << "Invalid initialization status" << LL_ENDL;
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 887ad157ba..09d7c2eb2d 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -30,8 +30,6 @@
#include <map>
#include <algorithm>
-#include "llstl.h"
-
#include "lltexturefetch.h"
#include "lldir.h"
@@ -4030,8 +4028,6 @@ TFReqSendMetrics::doWork(LLTextureFetch * fetcher)
mStatsSD["initial"] = initial_report;
mStatsSD["version"] = metrics_data_version;
mStatsSD["break"] = static_cast<bool>(LLTextureFetch::svMetricsDataBreak);
-
- LL_INFOS(LOG_TXT) << "ViewerAssetMetrics after fields added\n" << ll_pretty_print_sd(mStatsSD) << LL_ENDL;
// Update sequence number
if (S32_MAX == ++report_sequence)