diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-10 20:13:17 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-10 20:13:17 +0200 |
| commit | ebbca6470aa04c29712d92f6b52467188663e055 (patch) | |
| tree | 13b62d698ebc48d9efa1d65991744c71f9ff407e /indra/newview/llinventorymodel.h | |
| parent | f15767bbef4e0a87aa032e265b3a0a8d4db907e1 (diff) | |
| parent | c673ef4a913691cea8e94b688937084edb821f68 (diff) | |
merge
--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; |