diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-02-28 17:26:14 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-02-28 17:26:14 -0500 |
| commit | 3005bdf7aa628953bf640c1ab69ea7299b5876b1 (patch) | |
| tree | 3dead4cf3b5d4108a963cfb0fded739bd74422e0 /indra/newview/llinventorymodel.cpp | |
| parent | d1c144519306cae7eff7f781417482c85068988c (diff) | |
| parent | 105c286bf3906a17d4c8560573e81b09fc29086b (diff) | |
merge
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rwxr-xr-x | indra/newview/llinventorymodel.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index ac1f40b486..f0bfc68866 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 0 llvic->setVersion(NO_VERSION); +#else // SH-3860 WIP + 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); } } |