From 0ca3c5c7fdd6790d98259fc6d8459633896ce7a0 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 12 Apr 2016 12:08:59 -0700 Subject: Added exponential timeout to retry, protect against attempting to downgrade the COF version in the bake request. --- indra/newview/llappearancemgr.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index b97f9018c0..74024abf67 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -255,6 +255,8 @@ private: bool mAttachmentInvLinkEnabled; bool mOutfitIsDirty; bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls. + bool mOutstandingAppearanceBakeRequest; // A bake request is outstanding. Do not overlap. + bool mRerequestAppearanceBake; /** * Lock for blocking operations on outfit until server reply or timeout exceed -- cgit v1.2.3 From 118e82e4775c88ace273d6012b5def8b9f19d08f Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 13 Apr 2016 22:40:49 +0100 Subject: MAINT-6305: Serialize the AIS calls by reducing the queue size to 1, move the bake request out of the AIS queue. --- indra/newview/llappearancemgr.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 74024abf67..bf181cb4ad 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -228,7 +228,12 @@ public: private: +#ifdef APPEARANCEBAKE_AS_IN_AIS_QUEUE void serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter); +#else + void serverAppearanceUpdateCoro(); +#endif + static void debugAppearanceUpdateCOF(const LLSD& content); std::string mAppearanceServiceURL; -- cgit v1.2.3