V3 merge part 1 / 2.
This commit is contained in:
@@ -82,14 +82,14 @@ public:
|
||||
LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
|
||||
|
||||
// callbacks
|
||||
static void onClickSay( LLUICtrl*, void* userdata );
|
||||
void onClickSay(LLUICtrl* ctrl);
|
||||
|
||||
static void onTabClick( void* userdata );
|
||||
static void onInputEditorKeystroke(LLLineEditor* caller, void* userdata);
|
||||
static void onInputEditorFocusLost();
|
||||
static void onInputEditorGainFocus();
|
||||
|
||||
static void onCommitGesture(LLUICtrl* ctrl, void* data);
|
||||
void onCommitGesture(LLUICtrl* ctrl);
|
||||
|
||||
static void startChat(const char* line);
|
||||
static void stopChat();
|
||||
|
||||
Reference in New Issue
Block a user