diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/newview/llimview.h | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 11a6905a63..e787368324 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -165,7 +165,7 @@ public: void clearPendingAgentListUpdates(const LLUUID& session_id); //HACK: need a better way of enumerating existing session, or listening to session create/destroy events - const std::set<LLViewHandle>& getIMFloaterHandles() { return mFloaters; } + const std::set<LLHandle<LLFloater> >& getIMFloaterHandles() { return mFloaters; } private: class LLIMSessionInvite; @@ -199,7 +199,7 @@ private: static void onInviteNameLookup(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* userdata); private: - std::set<LLViewHandle> mFloaters; + std::set<LLHandle<LLFloater> > mFloaters; LLFriendObserver* mFriendObserver; // An IM has been received that you haven't seen yet. |