From aac43b9227617a7d53a505bf69f1c3b3171e66e9 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 2 Dec 2015 09:46:34 -0500
Subject: [PATCH] SL-270 WIP - removed some debug settings.
---
indra/newview/app_settings/settings.xml | 22 ----------------------
indra/newview/llstartup.cpp | 3 +--
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9a4def3be26..63b87bdbaa3 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10644,28 +10644,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>SkeletonFileName</key>
- <map>
- <key>Comment</key>
- <string>Alternative skeleton file name</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string>avatar_skeleton.xml</string>
- </map>
- <key>AvatarFileName</key>
- <map>
- <key>Comment</key>
- <string>Alternative avatar file name</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string>avatar_lad.xml</string>
- </map>
<key>ShowAdvancedGraphicsSettings</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index f1ffb398ec7..c02f821e8a9 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1258,8 +1258,7 @@ bool idle_startup()
LLPostProcess::initClass();
display_startup();
- // BENTO - remove these settings before release.
- LLAvatarAppearance::initClass(gSavedSettings.getString("AvatarFileName"),gSavedSettings.getString("SkeletonFileName"));
+ LLAvatarAppearance::initClass("avatar_lad.xml","avatar_skeleton.xml");
display_startup();
LLViewerObject::initVOClasses();
--
GitLab