EXT-6953 WIP - cleanup

3 files changed, 19 insertions, 39 deletions

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