diff options
Diffstat (limited to 'indra/newview/llappearancemgr.h')
-rwxr-xr-x | indra/newview/llappearancemgr.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 707b8d5a77..b90ef65f95 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -34,7 +34,6 @@ #include "llinventorymodel.h" #include "llinventoryobserver.h" #include "llviewerinventory.h" -#include "llhttpclient.h" class LLWearableHoldingPattern; class LLInventoryCallback; @@ -218,10 +217,10 @@ public: bool testCOFRequestVersion() const; - void decrementInFlightCounter()
- {
- mInFlightCounter = llmax(mInFlightCounter - 1, 0);
- }
+ void decrementInFlightCounter() + { + mInFlightCounter = llmax(mInFlightCounter - 1, 0); + } private: @@ -263,9 +262,9 @@ private: * to avoid unsynchronized outfit state or performing duplicate operations. */ bool mOutfitLocked; - S32 mInFlightCounter;
- LLTimer mInFlightTimer;
- static bool mActive;
+ S32 mInFlightCounter; + LLTimer mInFlightTimer; + static bool mActive; std::auto_ptr<LLOutfitUnLockTimer> mUnlockOutfitTimer; |