diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-12-02 09:46:34 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-12-02 09:46:34 -0500 |
| commit | aac43b9227617a7d53a505bf69f1c3b3171e66e9 (patch) | |
| tree | f27c2828bd88cd72b1f9bf3cca8ba5c44b718edb /indra/newview | |
| parent | 7b410df303d37a800ddd0024932729a574a00860 (diff) | |
SL-270 WIP - removed some debug settings.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 22 | ||||
| -rwxr-xr-x | indra/newview/llstartup.cpp | 3 |
2 files changed, 1 insertions, 24 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9a4def3be2..63b87bdbaa 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 f1ffb398ec..c02f821e8a 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(); |