diff options
Diffstat (limited to 'linden/indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | linden/indra/newview/llinventorymodel.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp index 743b06d..9df8fa4 100644 --- a/linden/indra/newview/llinventorymodel.cpp +++ b/linden/indra/newview/llinventorymodel.cpp | |||
| @@ -1486,11 +1486,18 @@ bool LLInventoryModel::loadSkeleton( | |||
| 1486 | { | 1486 | { |
| 1487 | LLViewerInventoryCategory* cat = categories[i]; | 1487 | LLViewerInventoryCategory* cat = categories[i]; |
| 1488 | cat_set_t::iterator cit = temp_cats.find(cat); | 1488 | cat_set_t::iterator cit = temp_cats.find(cat); |
| 1489 | if (cit == temp_cats.end()) | ||
| 1490 | { | ||
| 1491 | continue; // cache corruption?? not sure why this happens -SJB | ||
| 1492 | } | ||
| 1489 | LLViewerInventoryCategory* tcat = *cit; | 1493 | LLViewerInventoryCategory* tcat = *cit; |
| 1490 | 1494 | ||
| 1491 | // we can safely ignore anything loaded from file, but | 1495 | // we can safely ignore anything loaded from file, but |
| 1492 | // not sent down in the skeleton. | 1496 | // not sent down in the skeleton. |
| 1493 | if(cit == not_cached) continue; | 1497 | if(cit == not_cached) |
| 1498 | { | ||
| 1499 | continue; | ||
| 1500 | } | ||
| 1494 | if(cat->getVersion() != tcat->getVersion()) | 1501 | if(cat->getVersion() != tcat->getVersion()) |
| 1495 | { | 1502 | { |
| 1496 | // if the cached version does not match the server version, | 1503 | // if the cached version does not match the server version, |