diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-06 17:00:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-06 17:00:55 -0400 |
| commit | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (patch) | |
| tree | 779821c923eca8413bf7e21fd699b1af3ef7e6f3 /indra/newview/llappearancemgr.cpp | |
| parent | e2dea0b4947a1b0fefc1ddbe33ac74776128d1c5 (diff) | |
| parent | fc45e9cbf6ea74412acd8bb55098cfd15493292b (diff) | |
merge changes for storm-1588
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() |