diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-03-01 19:40:06 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-03-01 19:40:06 -0500 |
| commit | a0a9a60e283bf5e9a19551e359c154d3d20b3f2d (patch) | |
| tree | af85b743e4be02b5c82c998b232367fb96b2fbd6 /indra/newview/llinventorymodel.cpp | |
| parent | 3e5599a827238faa4fcccfad9702428ce4ea6f46 (diff) | |
| parent | 312b2563548c19837707b6598932d8ef19430f73 (diff) | |
merge
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rwxr-xr-x | indra/newview/llinventorymodel.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index f0bfc68866..ac1f40b486 100755 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1922,18 +1922,7 @@ 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); } } |