diff options
author | callum_linden <none@none> | 2015-10-20 16:39:00 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-10-20 16:39:00 -0700 |
commit | 6599e10d00f3a47e90136f5f6cb4b2d1e02cb2e5 (patch) | |
tree | d48c683923ee978db4dbb0d66cc0d9f45233a68e /indra/newview/llcallingcard.h | |
parent | c16e726d0e2a8c607ce441eb5bf2419b16b41cab (diff) | |
parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) |
Merge with tip of viewer-release
Diffstat (limited to 'indra/newview/llcallingcard.h')
-rwxr-xr-x | indra/newview/llcallingcard.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llcallingcard.h b/indra/newview/llcallingcard.h index 6e5fc01cd8..1f819a42fd 100755 --- a/indra/newview/llcallingcard.h +++ b/indra/newview/llcallingcard.h @@ -143,6 +143,7 @@ public: // observers left behind. void addObserver(LLFriendObserver* observer); void removeObserver(LLFriendObserver* observer); + void idleNotifyObservers(); void notifyObservers(); // Observers interested in updates of a particular avatar. @@ -209,6 +210,8 @@ private: LLAvatarTracker(const LLAvatarTracker&); bool operator==(const LLAvatarTracker&); + BOOL mIsNotifyObservers; + public: // don't you dare create or delete this object LLAvatarTracker(); |