aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llimpanel.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llimpanel.h')
-rw-r--r--linden/indra/newview/llimpanel.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index f3477bb..24f5c9b 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -47,6 +47,7 @@ class LLInventoryItem;
47class LLInventoryCategory; 47class LLInventoryCategory;
48class LLIMSpeakerMgr; 48class LLIMSpeakerMgr;
49class LLPanelActiveSpeakers; 49class LLPanelActiveSpeakers;
50class LLComboBox;
50 51
51class LLVoiceChannel : public LLVoiceClientStatusObserver 52class LLVoiceChannel : public LLVoiceClientStatusObserver
52{ 53{
@@ -228,12 +229,11 @@ public:
228 static void onInputEditorFocusLost(LLFocusableElement* caller, void* userdata); 229 static void onInputEditorFocusLost(LLFocusableElement* caller, void* userdata);
229 static void onInputEditorKeystroke(LLLineEditor* caller, void* userdata); 230 static void onInputEditorKeystroke(LLLineEditor* caller, void* userdata);
230 static void onCommitChat(LLUICtrl* caller, void* userdata); 231 static void onCommitChat(LLUICtrl* caller, void* userdata);
232 static void onCommitCombo(LLUICtrl* caller, void* userdata);
231 static void onTabClick( void* userdata ); 233 static void onTabClick( void* userdata );
232 234
233 static void onClickProfile( void* userdata );
234 static void onClickHistory( void* userdata ); 235 static void onClickHistory( void* userdata );
235 static void onClickGroupInfo( void* userdata ); 236 static void onClickGroupInfo( void* userdata );
236 static void onClickOfferTeleport( void* userdata );
237 static void onClickClose( void* userdata ); 237 static void onClickClose( void* userdata );
238 static void onClickStartCall( void* userdata ); 238 static void onClickStartCall( void* userdata );
239 static void onClickEndCall( void* userdata ); 239 static void onClickEndCall( void* userdata );
@@ -300,6 +300,7 @@ private:
300private: 300private:
301 LLLineEditor* mInputEditor; 301 LLLineEditor* mInputEditor;
302 LLViewerTextEditor* mHistoryEditor; 302 LLViewerTextEditor* mHistoryEditor;
303 LLComboBox* mComboIM;
303 304
304 // The value of the mSessionUUID depends on how the IM session was started: 305 // The value of the mSessionUUID depends on how the IM session was started:
305 // one-on-one ==> random id 306 // one-on-one ==> random id