From 74eb8428d2267d71bc7e236f030db9005767bebd Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 11 May 2016 11:54:34 +0200
Subject: [PATCH] Shooting at AIS3/Coro/Appearance bugs: Actually correct the
 local COF version to match the expected version we received from the server
 before issuing the appearance update request again

---
 indra/newview/llappearancemgr.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index d2ecdde7da..c299ca86a2 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3880,6 +3880,16 @@ void LLAppearanceMgr::serverAppearanceUpdateCoro()
                 S32 expectedCofVersion = result["expected"].asInteger();
                 LL_WARNS("Avatar") << "Server expected " << expectedCofVersion << " as COF version" << LL_ENDL;
 
+				// <FS:Ansariel> Correct local COF version to match the expected version
+				LLViewerInventoryCategory* cof_cat = gInventory.getCategory(LLAppearanceMgr::instance().getCOF());
+				if (cof_cat)
+				{
+					cof_cat->setVersion(expectedCofVersion);
+					gAgentAvatarp->mLastUpdateRequestCOFVersion = expectedCofVersion;
+					gAgentAvatarp->mLastUpdateReceivedCOFVersion = expectedCofVersion;
+				}
+				// </FS:Ansariel>
+
                 bRetry = true;
                 // Wait for a 1/2 second before trying again.  Just to keep from asking too quickly.
                 if (++retryCount > BAKE_RETRY_MAX_COUNT)