diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
| commit | 562006aa5585a42418cae978516505035cd34d8d (patch) | |
| tree | f42488d1b07907937f5b9e236617d9f02297d32d /indra/newview/llstartup.cpp | |
| parent | 9a8042d5a3edfd07727793a1939c3ab361ceec9a (diff) | |
| parent | 7cd1020f2953b776e1878e7b4e365d4b23e6b07b (diff) | |
Merge with SVN viewer-2.0.0-3 branch
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 |