diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2015-10-01 09:02:45 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2015-10-01 09:02:45 -0700 |
| commit | d3928405e3498fabd9215da96fcd0d72e71e83e1 (patch) | |
| tree | 218b97ae3d0173a9b8c106c09306aef03f42c7f6 /indra/newview/llstartup.cpp | |
| parent | c1e3f778cb377999edf49764088f3f23a2302afc (diff) | |
| parent | 6c422a881499c0d7649a59db47905a584bbd2bc1 (diff) | |
merge, close develop branch
--HG--
branch : develop
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index d2050aec3e..09cd4bb6f7 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1260,7 +1260,7 @@ bool idle_startup() LLPostProcess::initClass(); display_startup(); - LLAvatarAppearance::initClass(); + LLAvatarAppearance::initClass(gSavedSettings.getString("AvatarFileName"),gSavedSettings.getString("SkeletonFileName")); display_startup(); LLViewerObject::initVOClasses(); |