livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-6403: Updated a couple comments and dropped a couple warning levels back down to DEBUG.

master
Rider Linden 2016-05-24 13:03:36 -07:00
parent c7413e51b6
commit 26b1c020c8
5 changed files with 11 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llaisapi.cpp
View File

@ -966,7 +966,10 @@ void AISUpdate::doUpdate()
// the AIS version should be considered the true version. Adjust
// our local category model to reflect this version number. Otherwise
// it becomes possible to get stuck with the viewer being out of
// sync with the inventory system.
// sync with the inventory system. Under normal circumstances
// inventory COF is maintained on the viewer through calls to
// LLInventoryModel::accountForUpdate when a changing operation
// is performed. This occasionally gets out of sync however.
cat->setVersion(version);
}
}

17
indra/newview/llappearancemgr.cpp
View File

@ -70,7 +70,7 @@
namespace
{
const S32 BAKE_RETRY_MAX_COUNT = 5;
const F32 BAKE_RETRY_TIMEOUT = 4.0F;
const F32 BAKE_RETRY_TIMEOUT = 2.0F;
}
// *TODO$: LLInventoryCallback should be deprecated to conform to the new boost::bind/coroutine model.
@ -3361,15 +3361,9 @@ void LLAppearanceMgr::requestServerAppearanceUpdate()
{
if (!mOutstandingAppearanceBakeRequest)
{
#ifdef APPEARANCEBAKE_AS_IN_AIS_QUEUE
mRerequestAppearanceBake = false;
LLCoprocedureManager::CoProcedure_t proc = boost::bind(&LLAppearanceMgr::serverAppearanceUpdateCoro, this, _1);
LLCoprocedureManager::instance().enqueueCoprocedure("AIS", "LLAppearanceMgr::serverAppearanceUpdateCoro", proc);
#else
LLCoros::instance().launch("serverAppearanceUpdateCoro",
boost::bind(&LLAppearanceMgr::serverAppearanceUpdateCoro, this));
#endif
}
else
{
@ -3377,17 +3371,8 @@ void LLAppearanceMgr::requestServerAppearanceUpdate()
}
}
#ifdef APPEARANCEBAKE_AS_IN_AIS_QUEUE
void LLAppearanceMgr::serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter)
#else
void LLAppearanceMgr::serverAppearanceUpdateCoro()
#endif
{
#ifndef APPEARANCEBAKE_AS_IN_AIS_QUEUE
LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t httpAdapter(
new LLCoreHttpUtil::HttpCoroutineAdapter("serverAppearanceUpdateCoro", LLCore::HttpRequest::DEFAULT_POLICY_ID));
#endif
mRerequestAppearanceBake = false;
if (!gAgent.getRegion())
{

6
indra/newview/llappearancemgr.h
View File

@ -36,8 +36,6 @@
#include "llviewerinventory.h"
#include "llcorehttputil.h"
#define APPEARANCEBAKE_AS_IN_AIS_QUEUE 1
class LLWearableHoldingPattern;
class LLInventoryCallback;
class LLOutfitUnLockTimer;
@ -230,11 +228,7 @@ 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);

1
indra/newview/llavatarrendernotifier.cpp
View File

@ -207,7 +207,6 @@ void LLAvatarRenderNotifier::updateNotificationState()
mLastSkeletonSerialNum = gAgentAvatarp->mLastSkeletonSerialNum;
}
else if (mLastCofVersion >= 0
// && (mLastCofVersion != gAgentAvatarp->mLastUpdateRequestCOFVersion // RIDER: Check this!
&& (mLastCofVersion != LLAppearanceMgr::instance().getCOFVersion()
|| mLastSkeletonSerialNum != gAgentAvatarp->mLastSkeletonSerialNum))
{

51
indra/newview/llvoavatar.cpp
View File

@ -7357,7 +7357,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
S32 aisCOFVersion(LLAppearanceMgr::instance().getCOFVersion());
LL_INFOS("Avatar") << "handling self appearance message #" << thisAppearanceVersion <<
LL_DEBUGS("Avatar") << "handling self appearance message #" << thisAppearanceVersion <<
" (highest seen #" << mLastUpdateReceivedCOFVersion <<
") (AISCOF=#" << aisCOFVersion << ")" << LL_ENDL;
@ -7376,46 +7376,6 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
}
#if 0
S32 this_update_cof_version = contents.mCOFVersion;
S32 last_update_request_cof_version = mLastUpdateRequestCOFVersion;
if( isSelf() )
{
LL_DEBUGS("Avatar") << "this_update_cof_version " << this_update_cof_version
<< " last_update_request_cof_version " << last_update_request_cof_version
<< " my_cof_version " << LLAppearanceMgr::instance().getCOFVersion() << LL_ENDL;
if (largestSelfCOFSeen > this_update_cof_version)
{
LL_WARNS("Avatar") << "Already processed appearance for COF version " <<
largestSelfCOFSeen << ", discarding appearance with COF " << this_update_cof_version << LL_ENDL;
return;
}
largestSelfCOFSeen = this_update_cof_version;
}
else
{
LL_DEBUGS("Avatar") << "appearance message received" << LL_ENDL;
}
// Check for stale update.
if (isSelf()
&& (this_update_cof_version < last_update_request_cof_version))
{
LL_WARNS() << "Stale appearance update, wanted version " << last_update_request_cof_version
<< ", got " << this_update_cof_version << LL_ENDL;
return;
}
if (isSelf() && isEditingAppearance())
{
LL_DEBUGS("Avatar") << "ignoring appearance message while in appearance edit" << LL_ENDL;
return;
}
#endif
// SUNSHINE CLEANUP - is this case OK now?
S32 num_params = contents.mParamWeights.size();
if (num_params <= 1)
@ -7434,9 +7394,10 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
if (isSelf())
{
// Note:
// RequestAgentUpdateAppearanceResponder::onRequestRequested()
// assumes that cof version is only updated with server-bake
// appearance messages.
// locally the COF is maintained via LLInventoryModel::accountForUpdate
// which is called from various places. This should match the simhost's
// idea of what the COF version is. AIS however maintains its own version
// of the COF that should be considered canonical.
mLastUpdateReceivedCOFVersion = thisAppearanceVersion;
}
@ -7561,7 +7522,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
// Got an update for some other avatar
// Ignore updates for self, because we have a more authoritative value in the preferences.
setHoverOffset(contents.mHoverOffset);
LL_INFOS("Avatar") << avString() << "setting hover to " << contents.mHoverOffset[2] << LL_ENDL;
LL_DEBUGS("Avatar") << avString() << "setting hover to " << contents.mHoverOffset[2] << LL_ENDL;
}
if (!contents.mHoverOffsetWasSet && !isSelf())