From aa9c621cb90de75e919f36ba0f6db9d8bd447601 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 27 May 2010 15:19:26 -0400
Subject: EXT-6953 WIP - cleanup
---
indra/llcharacter/llkeyframewalkmotion.cpp | 16 +++++++--------
indra/newview/app_settings/settings.xml | 33 ++++++++++--------------------
indra/newview/llappviewer.cpp | 13 +++++++-----
indra/newview/llvoavatar.cpp | 12 -----------
4 files changed, 27 insertions(+), 47 deletions(-)
(limited to 'indra')
diff --git a/indra/llcharacter/llkeyframewalkmotion.cpp b/indra/llcharacter/llkeyframewalkmotion.cpp
index 232b617d69..561b26c022 100644
--- a/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -342,14 +342,14 @@ BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask)
if (mCharacter->getMotionController().mIsSelf)
{
F32 elapsed = mCharacter->getMotionController().getFrameTimer().getElapsedTimeF32();
- llinfos << "PLOT elapsed: " << elapsed
- << " footSlipVelocity: " << footSlipVelocity
- << " mAvgCorrection: " << mAvgCorrection
- << " mAvgSpeed: " << mAvgSpeed
- << " mAnimSpeed: " << mAnimSpeed
- << " ANIM_SPEED_MAX: " << ANIM_SPEED_MAX
- << " ANIM_SPEED_MIN: " << ANIM_SPEED_MIN
- << llendl;
+// llinfos << "PLOT elapsed: " << elapsed
+// << " footSlipVelocity: " << footSlipVelocity
+// << " mAvgCorrection: " << mAvgCorrection
+// << " mAvgSpeed: " << mAvgSpeed
+// << " mAnimSpeed: " << mAnimSpeed
+// << " ANIM_SPEED_MAX: " << ANIM_SPEED_MAX
+// << " ANIM_SPEED_MIN: " << ANIM_SPEED_MIN
+// << llendl;
}
// clamp pelvis offset to a 90 degree arc behind the nominal position
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 734dbcf609..4ce5358ade 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2676,6 +2676,17 @@
<key>Value</key>
<integer>4</integer>
</map>
+ <key>DumpVFSCaches</key>
+ <map>
+ <key>Comment</key>
+ <string>Dump VFS caches on startup.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>DynamicCameraStrength</key>
<map>
<key>Comment</key>
@@ -10362,28 +10373,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowWalkSliders</key>
- <map>
- <key>Comment</key>
- <string>Allow walk params to be adjusted on the fly.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>DumpVFSCaches</key>
- <map>
- <key>Comment</key>
- <string>Dump VFS caches on startup.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>UseStartScreen</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index d7632e69e8..475a075d7e 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2981,9 +2981,10 @@ S32 LLAppViewer::getCacheVersion()
void dumpVFSCaches()
{
- llinfos << "======= Dumping Static VFS ========" << llendl;
+ llinfos << "======= Static VFS ========" << llendl;
gStaticVFS->listFiles();
#if LL_WINDOWS
+ llinfos << "======= Dumping static VFS to StaticVFSDump ========" << llendl;
WCHAR w_str[MAX_PATH];
GetCurrentDirectory(MAX_PATH, w_str);
S32 res = LLFile::mkdir("StaticVFSDump");
@@ -2991,7 +2992,7 @@ void dumpVFSCaches()
{
if (errno != EEXIST)
{
- llwarns << "Couldn't create StaticVFSDump" << llendl;
+ llwarns << "Couldn't create dir StaticVFSDump" << llendl;
}
}
SetCurrentDirectory(utf8str_to_utf16str("StaticVFSDump").c_str());
@@ -2999,15 +3000,16 @@ void dumpVFSCaches()
SetCurrentDirectory(w_str);
#endif
- llinfos << "========= Dumping regular VFS ====" << llendl;
+ llinfos << "========= Dynamic VFS ====" << llendl;
gVFS->listFiles();
#if LL_WINDOWS
+ llinfos << "========= Dumping dynamic VFS to VFSDump ====" << llendl;
res = LLFile::mkdir("VFSDump");
if (res == -1)
{
if (errno != EEXIST)
{
- llwarns << "Couldn't create VFSDump" << llendl;
+ llwarns << "Couldn't create dir VFSDump" << llendl;
}
}
SetCurrentDirectory(utf8str_to_utf16str("VFSDump").c_str());
@@ -3232,11 +3234,12 @@ bool LLAppViewer::initCache()
{
LLVFile::initClass();
+#ifndef LL_RELEASE_FOR_DOWNLOAD
if (gSavedSettings.getBOOL("DumpVFSCaches"))
{
dumpVFSCaches();
-
}
+#endif
return true;
}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index d6d8c434d8..278bec1927 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3103,18 +3103,6 @@ void LLVOAvatar::slamPosition()
//------------------------------------------------------------------------
BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
{
- if (!LLApp::isExiting())
- {
- BOOL show_walk_sliders = gSavedSettings.getBOOL("ShowWalkSliders");
- if (show_walk_sliders)
- {
- LLDebugVarMessageBox::show("Adj Max", &SPEED_ADJUST_MAX, 5.0f, 0.1f);
- LLDebugVarMessageBox::show("Adj Max Sec", &SPEED_ADJUST_MAX_SEC, 5.0f, 0.1f);
- LLDebugVarMessageBox::show("Anim Max", &ANIM_SPEED_MAX, 10.0f, 0.1f);
- LLDebugVarMessageBox::show("Anim Min", &ANIM_SPEED_MIN, 10.0f, 0.1f);
- }
- }
-
LLMemType mt(LLMemType::MTYPE_AVATAR);
// clear debug text
--
cgit v1.2.3