diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-05-25 02:41:33 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-05-25 02:41:33 +0300 |
| commit | 238c1216c3feb83f91561a3e5a41f070b281097e (patch) | |
| tree | 9de0969ba29d4d3a500c1296cd131a95436a3e9f /indra/newview/llavatarrendernotifier.cpp | |
| parent | 00eda9e525cbecebc0b1df9bd68958fdbba145ad (diff) | |
| parent | 9ea13d49b7d0f9df72d23fbaf909b8bfa53b309e (diff) | |
Merged in rider_linden/viewer-lynx (pull request #18)
MAINT-6403: Correct the local COF version from AIS when it loses sync.
Diffstat (limited to 'indra/newview/llavatarrendernotifier.cpp')
| -rw-r--r-- | indra/newview/llavatarrendernotifier.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp index a13e142e16..24934fdb73 100644 --- a/indra/newview/llavatarrendernotifier.cpp +++ b/indra/newview/llavatarrendernotifier.cpp @@ -63,7 +63,7 @@ mLatestAgentComplexity(0), mLatestOverLimitPct(0.0f), mShowOverLimitAgents(false), mNotifyOutfitLoading(false), -mLastCofVersion(-1), +mLastCofVersion(LLViewerInventoryCategory::VERSION_UNKNOWN), mLastOutfitRezStatus(-1), mLastSkeletonSerialNum(-1) { @@ -207,8 +207,8 @@ void LLAvatarRenderNotifier::updateNotificationState() mLastSkeletonSerialNum = gAgentAvatarp->mLastSkeletonSerialNum; } else if (mLastCofVersion >= 0 - && (mLastCofVersion != gAgentAvatarp->mLastUpdateRequestCOFVersion - || mLastSkeletonSerialNum != gAgentAvatarp->mLastSkeletonSerialNum)) + && (mLastCofVersion != LLAppearanceMgr::instance().getCOFVersion() + || mLastSkeletonSerialNum != gAgentAvatarp->mLastSkeletonSerialNum)) { // version mismatch in comparison to previous outfit - outfit changed mNotifyOutfitLoading = true; |