summaryrefslogtreecommitdiff
path: root/indra/newview/llagentwearables.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-18 12:24:21 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-18 12:24:21 +0100
commit333f60ef3cf1a5ac4ce7687faf8369e7d0a4b2de (patch)
treeedb2169b848d848d834fe6e418c397c10c89a5ff /indra/newview/llagentwearables.h
parentcb50a2395bc37f1f7833171a976f67af9f2df66d (diff)
parent9aa710945685a2cae8cfc622f3dc3d900c1ab4c9 (diff)
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llagentwearables.h')
-rw-r--r--indra/newview/llagentwearables.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h
index 3295544e04..05913825dd 100644
--- a/indra/newview/llagentwearables.h
+++ b/indra/newview/llagentwearables.h
@@ -75,6 +75,7 @@ public:
BOOL isWearableCopyable(LLWearableType::EType type, U32 index /*= 0*/) const;
BOOL areWearablesLoaded() const;
+ bool isCOFChangeInProgress() const { return mCOFChangeInProgress; }
void updateWearablesLoaded();
void checkWearablesLoaded() const;
bool canMoveWearable(const LLUUID& item_id, bool closer_to_body);
@@ -233,6 +234,7 @@ public:
boost::signals2::connection addLoadedCallback(loaded_callback_t cb);
void notifyLoadingStarted();
+ void notifyLoadingFinished();
private:
loading_started_signal_t mLoadingStartedSignal; // should be called before wearables are changed
@@ -249,6 +251,11 @@ private:
static BOOL mInitialWearablesUpdateReceived;
BOOL mWearablesLoaded;
std::set<LLUUID> mItemsAwaitingWearableUpdate;
+
+ /**
+ * True if agent's outfit is being changed now.
+ */
+ BOOL mCOFChangeInProgress;
//--------------------------------------------------------------------------------
// Support classes