merge

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index ac1f40b486..171a2cd043 100755
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1922,7 +1922,18 @@ bool LLInventoryModel::loadSkeleton(
 			for(cat_set_t::iterator it = temp_cats.begin(); it != temp_cats.end(); ++it)
 			{
 				LLViewerInventoryCategory *llvic = (*it);
+#if 1
 				llvic->setVersion(NO_VERSION);
+#else
+				if (llvic->getPreferredType()==LLFolderType::FT_CURRENT_OUTFIT && llvic->getVersion()==1)
+				{
+					llinfos << "preserving empty COF for first-time login" << llendl;
+				}
+				else
+				{
+					llvic->setVersion(NO_VERSION);
+				}
+#endif
 				addCategory(*it);
 			}
 		}