diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-04-14 11:31:11 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-04-14 11:31:11 -0700 |
| commit | f9f5003f4a65c110c44fc3da7c465823ca267938 (patch) | |
| tree | 96427df4e311c72a1cb2bedd2a6aa70c05c6ad27 /indra/newview/llappearancemgr.h | |
| parent | 48016ff54bced607ba11bb02825974b5133ada34 (diff) | |
| parent | 9418e8b876a5193dea2ef2d583259909e595bbfe (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappearancemgr.h')
| -rwxr-xr-x | indra/newview/llappearancemgr.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index b97f9018c0..bf181cb4ad 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -228,7 +228,12 @@ public: private: +#ifdef APPEARANCEBAKE_AS_IN_AIS_QUEUE void serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter); +#else + void serverAppearanceUpdateCoro(); +#endif + static void debugAppearanceUpdateCOF(const LLSD& content); std::string mAppearanceServiceURL; @@ -255,6 +260,8 @@ private: bool mAttachmentInvLinkEnabled; bool mOutfitIsDirty; bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls. + bool mOutstandingAppearanceBakeRequest; // A bake request is outstanding. Do not overlap. + bool mRerequestAppearanceBake; /** * Lock for blocking operations on outfit until server reply or timeout exceed |