diff options
| author | Don Kjer <don@lindenlab.com> | 2007-09-14 21:13:20 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-09-14 21:13:20 +0000 |
| commit | 13c391f1984bb8cb9d67a7729af2ee5714409215 (patch) | |
| tree | 112edff1d25adabb4893e6746ba76a4182865f8a /indra/newview/llinventorymodel.h | |
| parent | b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (diff) | |
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
Diffstat (limited to 'indra/newview/llinventorymodel.h')
| -rw-r--r-- | indra/newview/llinventorymodel.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index 514448d1b1..7f90984659 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -142,6 +142,11 @@ public: BOOL include_trash, LLInventoryCollectFunctor& add); + // This method will return false if this inventory model is in an usabel state. + // The inventory model usage is sensitive to the initial construction of the + // model. + bool isInventoryUsable(); + // // Mutators // @@ -408,6 +413,9 @@ protected: static F32 sMinTimeBetweenFetches; static F32 sMaxTimeBetweenFetches; + // This flag is used to handle an invalid inventory state. + bool mIsAgentInvUsable; + public: // *NOTE: DEBUG functionality void dumpInventory(); @@ -777,3 +785,4 @@ protected: #endif // LL_LLINVENTORYMODEL_H + |