diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-10 16:05:53 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-10 16:05:53 +0200 |
| commit | c3d9aa60a799bb45b32c09870f92d576c9b571ce (patch) | |
| tree | 2fef4c4b45d63140535d46f61bd104b14ba8c920 /indra/newview/llinventorymodel.h | |
| parent | 7dabb3c46e6cdf208ce7dc46b89f431a247d6ba6 (diff) | |
| parent | 93adff4569d66d0a8699615b7a21d789921ca15c (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorymodel.h')
| -rw-r--r-- | indra/newview/llinventorymodel.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index aba0a619db..faf026887a 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -446,7 +446,8 @@ protected: // file import/export. static bool loadFromFile(const std::string& filename, cat_array_t& categories, - item_array_t& items); + item_array_t& items, + bool& is_cache_obsolete); static bool saveToFile(const std::string& filename, const cat_array_t& categories, const item_array_t& items); @@ -518,6 +519,9 @@ protected: static F32 sMaxTimeBetweenFetches; static S16 sBulkFetchCount; + // Expected inventory cache version + const static S32 sCurrentInvCacheVersion; + // This flag is used to handle an invalid inventory state. bool mIsAgentInvUsable; |