diff options
author | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
commit | 089fc07d207c71ce1401e72f09c31ad8c45872e2 (patch) | |
tree | 0028955add042c6f45b47a7b774adeeac9c592cb /linden/indra/newview/llimpanel.h | |
parent | Second Life viewer sources 1.16.0.5 (diff) | |
download | meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.zip meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.gz meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.bz2 meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.xz |
Second Life viewer sources 1.17.0.12
Diffstat (limited to 'linden/indra/newview/llimpanel.h')
-rw-r--r-- | linden/indra/newview/llimpanel.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h index e760513..00b7033 100644 --- a/linden/indra/newview/llimpanel.h +++ b/linden/indra/newview/llimpanel.h | |||
@@ -71,7 +71,7 @@ public: | |||
71 | 71 | ||
72 | // add target ids to the session. | 72 | // add target ids to the session. |
73 | // Return TRUE if successful, otherwise FALSE. | 73 | // Return TRUE if successful, otherwise FALSE. |
74 | BOOL addParticipants(const LLDynamicArray<LLUUID>& agent_ids); | 74 | BOOL inviteToSession(const LLDynamicArray<LLUUID>& agent_ids); |
75 | 75 | ||
76 | void addHistoryLine(const std::string &utf8msg, | 76 | void addHistoryLine(const std::string &utf8msg, |
77 | const LLColor4& color = LLColor4::white, | 77 | const LLColor4& color = LLColor4::white, |
@@ -98,10 +98,7 @@ public: | |||
98 | 98 | ||
99 | const LLUUID& getSessionID() const { return mSessionUUID; } | 99 | const LLUUID& getSessionID() const { return mSessionUUID; } |
100 | const LLUUID& getOtherParticipantID() const { return mOtherParticipantUUID; } | 100 | const LLUUID& getOtherParticipantID() const { return mOtherParticipantUUID; } |
101 | 101 | const EInstantMessage getDialogType() const { return mDialog; } | |
102 | // HACK -- for enabling a teleport button for helpers | ||
103 | static void onTeleport(void* userdata); | ||
104 | void addTeleportButton(); | ||
105 | 102 | ||
106 | void sessionInitReplyReceived(const LLUUID& im_session_id); | 103 | void sessionInitReplyReceived(const LLUUID& im_session_id); |
107 | 104 | ||