From 6e2e83a6086417cda312c3c46224e75c68372242 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 25 Aug 2015 17:34:56 +0300 Subject: MAINT-5547 FIXED errors when texturing a linkset "Unable to add texture. Please wait a few seconds and try again." --- indra/newview/llviewerobject.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewerobject.h') 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. -- cgit v1.2.3