diff options
| author | callum <none@none> | 2011-08-29 17:19:20 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-08-29 17:19:20 -0700 |
| commit | ce921ad1019b900bf78d98952dc63595c818dff4 (patch) | |
| tree | f5e8e018b63323891ae35da4c0d8a4b5db1cf464 /indra/newview/llappearancemgr.cpp | |
| parent | d341c400fc2e1991416bd6857a34b5a306a9144f (diff) | |
| parent | 0af17d6e8e9cbbe5e1acb7aed8f296db55522c44 (diff) | |
Merge with head.
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 1388d9aee0..a0af94ba77 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2285,7 +2285,9 @@ void LLAppearanceMgr::autopopulateOutfits() void LLAppearanceMgr::onFirstFullyVisible() { gAgentAvatarp->debugAvatarVisible(); - autopopulateOutfits(); + // The auto-populate is failing at the point of generating outfits
+ // folders, so don't do the library copy until that is resolved.
+ // autopopulateOutfits(); } bool LLAppearanceMgr::updateBaseOutfit() |