diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 18:29:17 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 18:29:17 -0400 |
commit | 3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (patch) | |
tree | 7cd7cef085a002885a362337fc8b67060bfcc395 /indra/newview/llappearancemgr.cpp | |
parent | 31d3d654f156351e3cf29f97fd97cbda046ae650 (diff) | |
parent | 959edebeca3c1d9f0730292c2f3bc0e8bb5bf94a (diff) |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r-- | indra/newview/llappearancemgr.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index a1d9786321..b57c268391 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -3889,7 +3889,6 @@ LLAppearanceMgr::LLAppearanceMgr(): mAttachmentInvLinkEnabled(false), mOutfitIsDirty(false), mOutfitLocked(false), - mInFlightCounter(0), mInFlightTimer(), mIsInUpdateAppearanceFromCOF(false), mOutstandingAppearanceBakeRequest(false), |