From e140118fc41b79e403b299cabe1653af1971e87a Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 25 Mar 2015 11:31:11 -0700 Subject: Replace appearance responder with new LLCore Appearance Handler. Prep for some slight cleanup of the code. Add AP_AVATAR Policy --- indra/newview/llappearancemgr.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 7742a19c07..74d4829ed2 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -225,9 +225,22 @@ public: void setAppearanceServiceURL(const std::string& url) { mAppearanceServiceURL = url; } std::string getAppearanceServiceURL() const; + + bool testCOFRequestVersion() const; + void LLAppearanceMgr::decrementInFlightCounter() + { + mInFlightCounter = llmax(mInFlightCounter - 1, 0); + } + + private: std::string mAppearanceServiceURL; + LLCore::HttpRequest::ptr_t mHttpRequest; + LLCore::HttpHeaders::ptr_t mHttpHeaders; + LLCore::HttpOptions::ptr_t mHttpOptions; + LLCore::HttpRequest::policy_t mHttpPolicy; + LLCore::HttpRequest::priority_t mHttpPriority; protected: LLAppearanceMgr(); @@ -248,17 +261,20 @@ private: static void onOutfitRename(const LLSD& notification, const LLSD& response); + bool onIdle(); + bool mAttachmentInvLinkEnabled; bool mOutfitIsDirty; bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls. - LLPointer mAppearanceResponder; - /** * Lock for blocking operations on outfit until server reply or timeout exceed * to avoid unsynchronized outfit state or performing duplicate operations. */ bool mOutfitLocked; + S32 mInFlightCounter; + LLTimer mInFlightTimer; + static bool mActive; std::auto_ptr mUnlockOutfitTimer; -- cgit v1.2.3 From 281d1166cb302679bb2b1375bab9b238d59fdb87 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 25 Mar 2015 13:02:52 -0700 Subject: gcc remove extra qualification on decrementInFlightCounter static. --- indra/newview/llappearancemgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 74d4829ed2..812d3c366c 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -227,7 +227,7 @@ public: bool testCOFRequestVersion() const; - void LLAppearanceMgr::decrementInFlightCounter() + void decrementInFlightCounter() { mInFlightCounter = llmax(mInFlightCounter - 1, 0); } -- cgit v1.2.3 From 77a9d183aa94496bd3e7d354f0744d0509bc3734 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 25 Mar 2015 14:49:44 -0700 Subject: Some slight reorganization and removal of some dead code. --- indra/newview/llappearancemgr.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 812d3c366c..707b8d5a77 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -39,7 +39,6 @@ class LLWearableHoldingPattern; class LLInventoryCallback; class LLOutfitUnLockTimer; -class RequestAgentUpdateAppearanceResponder; class LLAppearanceMgr: public LLSingleton { @@ -54,7 +53,6 @@ public: void updateAppearanceFromCOF(bool enforce_item_restrictions = true, bool enforce_ordering = true, nullary_func_t post_update_func = no_op); - bool needToSaveCOF(); void updateCOF(const LLUUID& category, bool append = false); void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append); void wearInventoryCategoryOnAvatar(LLInventoryCategory* category, bool append); @@ -215,13 +213,6 @@ public: void requestServerAppearanceUpdate(); - void incrementCofVersion(LLHTTPClient::ResponderPtr responder_ptr = NULL); - - U32 getNumAttachmentsInCOF(); - - // *HACK Remove this after server side texture baking is deployed on all sims. - void incrementCofVersionLegacy(); - void setAppearanceServiceURL(const std::string& url) { mAppearanceServiceURL = url; } std::string getAppearanceServiceURL() const; -- cgit v1.2.3 From f6ba7514d2392bfb5bbbe8b003b4b860118fddc5 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 26 Mar 2015 10:34:19 -0700 Subject: Fix line endings on appearancemgr and added LLCore::Http to llAgent. --- indra/newview/llappearancemgr.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 707b8d5a77..b90ef65f95 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -34,7 +34,6 @@ #include "llinventorymodel.h" #include "llinventoryobserver.h" #include "llviewerinventory.h" -#include "llhttpclient.h" class LLWearableHoldingPattern; class LLInventoryCallback; @@ -218,10 +217,10 @@ public: bool testCOFRequestVersion() const; - void decrementInFlightCounter() - { - mInFlightCounter = llmax(mInFlightCounter - 1, 0); - } + void decrementInFlightCounter() + { + mInFlightCounter = llmax(mInFlightCounter - 1, 0); + } private: @@ -263,9 +262,9 @@ private: * to avoid unsynchronized outfit state or performing duplicate operations. */ bool mOutfitLocked; - S32 mInFlightCounter; - LLTimer mInFlightTimer; - static bool mActive; + S32 mInFlightCounter; + LLTimer mInFlightTimer; + static bool mActive; std::auto_ptr mUnlockOutfitTimer; -- cgit v1.2.3 From b9e80807091aa7a27f1a10a23dd32bbb292d9dfb Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 26 Mar 2015 16:41:16 -0700 Subject: Adding llagentlanguage to new LLCore::Http code moved some of llappearancemgr handling into llAgent. --- indra/newview/llappearancemgr.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index b90ef65f95..760a0bc6ef 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -226,12 +226,6 @@ public: private: std::string mAppearanceServiceURL; - LLCore::HttpRequest::ptr_t mHttpRequest; - LLCore::HttpHeaders::ptr_t mHttpHeaders; - LLCore::HttpOptions::ptr_t mHttpOptions; - LLCore::HttpRequest::policy_t mHttpPolicy; - LLCore::HttpRequest::priority_t mHttpPriority; - protected: LLAppearanceMgr(); ~LLAppearanceMgr(); @@ -251,8 +245,6 @@ private: static void onOutfitRename(const LLSD& notification, const LLSD& response); - bool onIdle(); - bool mAttachmentInvLinkEnabled; bool mOutfitIsDirty; bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls. -- cgit v1.2.3 From cf4fec954ca46a139465144ccc3888b8fc7d41da Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Mon, 8 Jun 2015 17:29:01 -0700 Subject: Added a way to pass a policy Id to the coroadapter. Changed language, appearance, and maturity to conform to use the adapter rather than the SDHandler --- indra/newview/llappearancemgr.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 669d7242aa..3d9a1f1518 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -233,6 +233,9 @@ public: private: + void serverAppearanceUpdateSuccess(const LLSD &result); + static void debugAppearanceUpdateCOF(const LLSD& content); + std::string mAppearanceServiceURL; protected: -- cgit v1.2.3 From edd23c42fa3dc1ac7baa06fb2e02e1a602030a75 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 6 Oct 2015 14:17:37 -0700 Subject: MAINT-5693: Consolidated the avatar appearance request into a coroutine. If the request fails because of a stale COF, then rerequest with the corrected one. --- indra/newview/llappearancemgr.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 9b6ceb7d3e..118648b7c3 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -225,15 +225,9 @@ public: std::string getAppearanceServiceURL() const; - bool testCOFRequestVersion() const; - void decrementInFlightCounter() - { - mInFlightCounter = llmax(mInFlightCounter - 1, 0); - } - private: - void serverAppearanceUpdateSuccess(const LLSD &result); + void serverAppearanceUpdateCoro(); static void debugAppearanceUpdateCOF(const LLSD& content); std::string mAppearanceServiceURL; -- cgit v1.2.3 From 5093fe3da1f245817e51db5100070374bc278fe1 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 25 Feb 2016 11:49:01 -0800 Subject: MAINT-5693: Some bake requests were getting lost. If a bake request is made while another one is outstanding rather than launch the new one, set a flag and remake the request with new data. --- 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 118648b7c3..ebe564c3ea 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -254,6 +254,8 @@ private: bool mAttachmentInvLinkEnabled; bool mOutfitIsDirty; bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls. + bool mIsServerBakeOutstanding; // A server texture bake has been sent to the server and we are waiting on a response. + bool mNewServerBakeRequested; // A server texture bake has been requested, but there is already one outstanding. /** * Lock for blocking operations on outfit until server reply or timeout exceed -- cgit v1.2.3 From 3b790524865dc7a61496ee8ba90520d8be7cadf1 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 3 Mar 2016 10:15:47 -0800 Subject: MAINT-5693: Move avatar update into the AIS coprocedure pool. --- indra/newview/llappearancemgr.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index ebe564c3ea..b97f9018c0 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -34,6 +34,7 @@ #include "llinventorymodel.h" #include "llinventoryobserver.h" #include "llviewerinventory.h" +#include "llcorehttputil.h" class LLWearableHoldingPattern; class LLInventoryCallback; @@ -227,7 +228,7 @@ public: private: - void serverAppearanceUpdateCoro(); + void serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter); static void debugAppearanceUpdateCOF(const LLSD& content); std::string mAppearanceServiceURL; @@ -254,8 +255,6 @@ private: bool mAttachmentInvLinkEnabled; bool mOutfitIsDirty; bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls. - bool mIsServerBakeOutstanding; // A server texture bake has been sent to the server and we are waiting on a response. - bool mNewServerBakeRequested; // A server texture bake has been requested, but there is already one outstanding. /** * Lock for blocking operations on outfit until server reply or timeout exceed -- cgit v1.2.3