diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-02-28 08:40:28 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-02-28 08:40:28 -0500 |
| commit | 10acb5d321be9f43859a08d5d0f04d09b77f8c5c (patch) | |
| tree | b55f3ed46e57c4d6b83fed8494bd1ac723dc3e70 /indra/newview/llinventorymodel.cpp | |
| parent | 83eda3f1524a08fa6fc4fbd836c92ae95e8100bc (diff) | |
| parent | 2b6d7e50053a7efd2a20032c801d4b7db3b49dc1 (diff) | |
merge
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rwxr-xr-x | indra/newview/llinventorymodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 171a2cd043..f0bfc68866 100755 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1922,9 +1922,9 @@ bool LLInventoryModel::loadSkeleton( for(cat_set_t::iterator it = temp_cats.begin(); it != temp_cats.end(); ++it) { LLViewerInventoryCategory *llvic = (*it); -#if 1 +#if 0 llvic->setVersion(NO_VERSION); -#else +#else // SH-3860 WIP if (llvic->getPreferredType()==LLFolderType::FT_CURRENT_OUTFIT && llvic->getVersion()==1) { llinfos << "preserving empty COF for first-time login" << llendl; |