diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-08-17 12:42:14 -0700 | 
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-08-17 12:42:14 -0700 | 
| commit | d258fe40353642b20524ef320b70e6b9bf0f8ec4 (patch) | |
| tree | 40918499d2a59dcbbac51f7d24930c174537fe27 /indra/newview/llavatarrendernotifier.cpp | |
| parent | 1edf48a0c763dee0f5d274ede6ab82d8d9b30246 (diff) | |
| parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) | |
Merge
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;  | 
