diff options
| author | Bradley Payne <vir@lindenlab.com> | 2009-09-10 18:42:19 +0000 |
|---|---|---|
| committer | Bradley Payne <vir@lindenlab.com> | 2009-09-10 18:42:19 +0000 |
| commit | 73d152093dd5bb31ad264afdd3dc8e283dff49e3 (patch) | |
| tree | f69a7b99e675affb4bd4b3cab248b425caaf5566 /indra/newview/llstartup.cpp | |
| parent | 3dfa1e4ab9da0d2a5d48ea771877fc16fdd73ad5 (diff) | |
For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3.
svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 8fb0f201cb..44e76a0bc1 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -188,6 +188,7 @@ #include "llagentlanguage.h" #include "llwearable.h" #include "llinventorybridge.h" +#include "llappearancemgr.h" #if LL_WINDOWS #include "llwindebug.h" @@ -3345,10 +3346,10 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name, } else { - wear_outfit_by_name(outfit_folder_name); + LLAppearanceManager::wearOutfitByName(outfit_folder_name); } - wear_outfit_by_name(gestures); - wear_outfit_by_name(COMMON_GESTURES_FOLDER); + LLAppearanceManager::wearOutfitByName(gestures); + LLAppearanceManager::wearOutfitByName(COMMON_GESTURES_FOLDER); // This is really misnamed -- it means we have started loading // an outfit/shape that will give the avatar a gender eventually. JC |