summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2011-09-14 10:41:52 -0400
committerprep <prep@lindenlab.com>2011-09-14 10:41:52 -0400
commitdf40eca093b1a238daea9cd23c44f6e39719bf51 (patch)
tree205c15512a7fa363ebcea0de8e3ce16a3a58ca38 /indra/newview/llappearancemgr.cpp
parent4efca483d7dc8c8a50ebe247c6c163c263ed20f5 (diff)
parenta250df980b3f37e245d30e51ab65831ae1de0ce0 (diff)
merge
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp4
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()