diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-16 11:04:12 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-16 11:04:12 -0400 |
commit | 099e3b41668a8c951cf74ec585ed4192bab507db (patch) | |
tree | 5481b7cbb15e5674d552fb063227c1277bcdb78b /indra/newview/llappearancemgr.cpp | |
parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) | |
parent | d2c3c2f9fe197b1856e9a8ed37aeb56b77e2ff07 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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 ff5439d610..8e60517993 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -3942,7 +3942,6 @@ LLAppearanceMgr::LLAppearanceMgr(): mAttachmentInvLinkEnabled(false), mOutfitIsDirty(false), mOutfitLocked(false), - mInFlightCounter(0), mInFlightTimer(), mIsInUpdateAppearanceFromCOF(false), mOutstandingAppearanceBakeRequest(false), |