summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-03-01 09:06:40 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-03-01 09:06:40 -0500
commit70e22de2bb9bf8515d7e3cd68c7328beb75409d6 (patch)
tree813475085d242d5cdf296bda224c74142c6ccf89 /indra/newview/llstartup.cpp
parentecb3d1d64d035f22c6d85864131cae6a1108fc68 (diff)
SH-3860 WIP - fixes the cloud on initial login, still have a COF version rae condition due to creation of the base outfit link
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llstartup.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 717f578ddb..156aa25274 100644..100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2580,13 +2580,9 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
bool do_copy = true;
bool do_append = false;
LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);
-#if 0 // SH-3860 WIP
// Need to fetch cof contents before we can wear.
callAfterCategoryFetch(LLAppearanceMgr::instance().getCOF(),
boost::bind(&LLAppearanceMgr::wearInventoryCategory, LLAppearanceMgr::getInstance(), cat, do_copy, do_append));
-#else
- LLAppearanceMgr::instance().wearInventoryCategory(cat, do_copy, do_append);
-#endif
lldebugs << "initial outfit category id: " << cat_id << llendl;
}