diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-08-28 20:59:28 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-08-28 20:59:28 +0300 |
| commit | 12ff893e98ec00c51ef2d3fc4cb16bf8bc4f856a (patch) | |
| tree | 9ff1664948fa0a63a001d74546ae0d63484fbab4 /indra/newview/llviewerobject.h | |
| parent | 9c391b3deaf66e698590065b6770549e00f4d9bc (diff) | |
| parent | 41d2a60cba059539e708380f8964dea45a119546 (diff) | |
Merged lindenlab/viewer-lion into default
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rwxr-xr-x | indra/newview/llviewerobject.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index db2749f413..65d6f8225f 100755 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -436,8 +436,8 @@ public: void removeInventoryListener(LLVOInventoryListener* listener); BOOL isInventoryPending() { return mInventoryPending; } void clearInventoryListeners(); + bool hasInventoryListeners(); void requestInventory(); - void fetchInventoryFromServer(); static void processTaskInv(LLMessageSystem* msg, void** user_data); void removeInventory(const LLUUID& item_id); @@ -593,6 +593,9 @@ private: static void initObjectDataMap(); + // forms task inventory request if none are pending + void fetchInventoryFromServer(); + public: // // Viewer-side only types - use the LL_PCODE_APP mask. |