diff options
| author | Richard Linden <none@none> | 2013-07-30 19:15:46 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-30 19:15:46 -0700 |
| commit | 5762c1d0d727f0050aefe7126ab2d5280bebfb9b (patch) | |
| tree | 78bdcc931460dfc45d35cd1707ddf1afdf049a2e /indra/newview/llimview.h | |
| parent | 4cca9ba279f908f206fa5e32adccf1038f05cc7f (diff) | |
| parent | 910874a7e32bdfc456474e2d0ee84d190be3011e (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llimview.h')
| -rwxr-xr-x | indra/newview/llimview.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 2d036cbc2f..382b0e0a77 100755 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -33,7 +33,6 @@ #include "lllogchat.h" #include "llvoicechannel.h" -#include "lldarray.h" class LLAvatarName; class LLFriendObserver; @@ -354,7 +353,7 @@ public: LLUUID addSession(const std::string& name, EInstantMessage dialog, const LLUUID& other_participant_id, - const LLDynamicArray<LLUUID>& ids, bool voice = false, + const std::vector<LLUUID>& ids, bool voice = false, const LLUUID& floater_id = LLUUID::null); /** @@ -457,8 +456,8 @@ private: // prints a simple message if they are not online. Used to help // reduce 'hello' messages to the linden employees unlucky enough // to have their calling card in the default inventory. - void noteOfflineUsers(const LLUUID& session_id, const LLDynamicArray<LLUUID>& ids); - void noteMutedUsers(const LLUUID& session_id, const LLDynamicArray<LLUUID>& ids); + void noteOfflineUsers(const LLUUID& session_id, const std::vector<LLUUID>& ids); + void noteMutedUsers(const LLUUID& session_id, const std::vector<LLUUID>& ids); void processIMTypingCore(const LLIMInfo* im_info, BOOL typing); |