summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-09-02 20:24:06 -0700
committerRichard Linden <none@none>2011-09-02 20:24:06 -0700
commitfc45e9cbf6ea74412acd8bb55098cfd15493292b (patch)
tree27c697035feb1d5d7e6de07e9834d49271b5b1ee /indra/newview/llappearancemgr.cpp
parent0ab6eee0996c78d32b722157140cea5a21a5e460 (diff)
parent1836dd12c9b45e90aeab095dd4cc3e9cdcaf2190 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
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()