Skip to content
Snippets Groups Projects
Commit cfcc31c4 authored by andreykproductengine's avatar andreykproductengine
Browse files

MAINT-5570 additional comments, extended functionality of some variables

parent 47dfdff3
No related branches found
No related tags found
No related merge requests found
...@@ -62,8 +62,8 @@ mLatestAgentComplexity(0), ...@@ -62,8 +62,8 @@ mLatestAgentComplexity(0),
mLatestOverLimitPct(0.0f), mLatestOverLimitPct(0.0f),
mShowOverLimitAgents(false), mShowOverLimitAgents(false),
mNotifyOutfitLoading(false), mNotifyOutfitLoading(false),
mInitialCofVersion(-1), mLastCofVersion(-1),
mInitialOtfitRezStatus(-1), mLastOutfitRezStatus(-1),
mLastSkeletonSerialNum(-1) mLastSkeletonSerialNum(-1)
{ {
mPopUpDelayTimer.resetWithExpiry(OVER_LIMIT_UPDATE_DELAY); mPopUpDelayTimer.resetWithExpiry(OVER_LIMIT_UPDATE_DELAY);
...@@ -189,24 +189,32 @@ void LLAvatarRenderNotifier::updateNotificationState() ...@@ -189,24 +189,32 @@ void LLAvatarRenderNotifier::updateNotificationState()
return; return;
} }
if (mInitialCofVersion < 0 // Don't use first provided COF and Sceleton versions - let them load anf 'form' first
if (mLastCofVersion < 0
&& gAgentWearables.areWearablesLoaded() && gAgentWearables.areWearablesLoaded()
&& LLAttachmentsMgr::getInstance()->isAttachmentStateComplete()) && LLAttachmentsMgr::getInstance()->isAttachmentStateComplete())
{ {
// cof formed // cof formed
mInitialCofVersion = LLAppearanceMgr::instance().getCOFVersion(); mLastCofVersion = LLAppearanceMgr::instance().getCOFVersion();
mLastSkeletonSerialNum = gAgentAvatarp->mLastSkeletonSerialNum; mLastSkeletonSerialNum = gAgentAvatarp->mLastSkeletonSerialNum;
} }
else if (mLastCofVersion >= 0
if (gAgentAvatarp->mLastRezzedStatus >= mInitialOtfitRezStatus) && (mLastCofVersion != gAgentAvatarp->mLastUpdateRequestCOFVersion
|| mLastSkeletonSerialNum != gAgentAvatarp->mLastSkeletonSerialNum))
{ {
mInitialOtfitRezStatus = gAgentAvatarp->mLastRezzedStatus; // version mismatch in comparison to previous outfit - outfit changed
mNotifyOutfitLoading = true;
mLastCofVersion = LLAppearanceMgr::instance().getCOFVersion();
mLastSkeletonSerialNum = gAgentAvatarp->mLastSkeletonSerialNum;
} }
else
if (gAgentAvatarp->mLastRezzedStatus < mLastOutfitRezStatus)
{ {
// rez status decreased - outfit related action was initiated // rez status decreased - outfit related action was initiated
mNotifyOutfitLoading = true; mNotifyOutfitLoading = true;
} }
mLastOutfitRezStatus = gAgentAvatarp->mLastRezzedStatus;
} }
void LLAvatarRenderNotifier::updateNotificationAgent(U32 agentComplexity) void LLAvatarRenderNotifier::updateNotificationAgent(U32 agentComplexity)
{ {
...@@ -224,14 +232,7 @@ void LLAvatarRenderNotifier::updateNotificationAgent(U32 agentComplexity) ...@@ -224,14 +232,7 @@ void LLAvatarRenderNotifier::updateNotificationAgent(U32 agentComplexity)
// We should not notify about initial outfit and it's load process without reason // We should not notify about initial outfit and it's load process without reason
updateNotificationState(); updateNotificationState();
if (mInitialCofVersion >= 0 if (mLatestOverLimitAgents > 0)
&& (mInitialCofVersion != gAgentAvatarp->mLastUpdateRequestCOFVersion
|| mLastSkeletonSerialNum != gAgentAvatarp->mLastSkeletonSerialNum))
{
// version mismatch in comparison to initial outfit - outfit changed
mNotifyOutfitLoading = true;
}
else if (mLatestOverLimitAgents > 0)
{ {
// Some users can't see agent already, notify user about complexity growth // Some users can't see agent already, notify user about complexity growth
mNotifyOutfitLoading = true; mNotifyOutfitLoading = true;
......
...@@ -72,9 +72,13 @@ class LLAvatarRenderNotifier : public LLSingleton<LLAvatarRenderNotifier> ...@@ -72,9 +72,13 @@ class LLAvatarRenderNotifier : public LLSingleton<LLAvatarRenderNotifier>
// initial outfit related variables (state control) // initial outfit related variables (state control)
bool mNotifyOutfitLoading; bool mNotifyOutfitLoading;
S32 mInitialCofVersion;
S32 mInitialOtfitRezStatus; // COF (inventory folder) and Skeleton (voavatar) are used to spot changes in outfit.
S32 mLastCofVersion;
S32 mLastSkeletonSerialNum; S32 mLastSkeletonSerialNum;
// Used to detect changes in voavatar's rezzed status.
// If value decreases - there were changes in outfit.
S32 mLastOutfitRezStatus;
}; };
#endif /* ! defined(LL_llavatarrendernotifier_H) */ #endif /* ! defined(LL_llavatarrendernotifier_H) */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment