diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-02-28 23:34:59 +0000 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-02-28 23:34:59 +0000 |
| commit | fa29880ecd1ca9fb34507e1b712b111a7a3bb63e (patch) | |
| tree | 4d2b4aec4ac8317a88cbd205fb8f5f5b0387af9a /indra/newview/llinventorymodel.cpp | |
| parent | fa3f91e454ac82beffe4aca3789445e8ddf2b27f (diff) | |
| parent | 3005bdf7aa628953bf640c1ab69ea7299b5876b1 (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); } } |