diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-08 10:40:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 10:40:32 -0700 |
| commit | b4a53226c8b1b4a31c0f1411b110a0a32fa3599f (patch) | |
| tree | f96c967713d9733f8bc5bae959a53ead40e393af /indra/newview/llimview.h | |
| parent | fa0c34afc6678c9ab1814c81e11c65e4bf3d1317 (diff) | |
| parent | f7f85dd0dda563a9fb49ed65b193a9ea98da9ba2 (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 9d19af4b62..58a2ac5162 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -347,10 +347,12 @@ public: // Adds a session using a specific group of starting agents // the dialog type is assumed correct. Returns the uuid of the session. + // A session can be added to a floater specified by floater_id. LLUUID addSession(const std::string& name, EInstantMessage dialog, const LLUUID& other_participant_id, - const LLDynamicArray<LLUUID>& ids, bool voice = false); + const LLDynamicArray<LLUUID>& ids, bool voice = false, + const LLUUID& floater_id = LLUUID::null); /** * Creates a P2P session with the requisite handle for responding to voice calls. |