From 138bf1132262c479dbbd5c95195db46b1efd065f Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 24 Aug 2009 20:04:52 +0000
Subject: merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3

DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
---
 indra/newview/llnearbychatbar.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llnearbychatbar.h')

diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h
index 4b0c42c3c0..19177e37b3 100644
--- a/indra/newview/llnearbychatbar.h
+++ b/indra/newview/llnearbychatbar.h
@@ -53,7 +53,7 @@ public:
 	~LLGestureComboBox();
 
 	void refreshGestures();
-	void onCommitGesture(LLUICtrl* ctrl);
+	void onCommitGesture();
 	virtual void draw();
 
 	// LLGestureManagerObserver trigger
@@ -61,6 +61,7 @@ public:
 
 protected:
 	LLFrameTimer mGestureLabelTimer;
+	std::vector<LLMultiGesture*> mGestures;
 	std::string mLabel;
 };
 
-- 
cgit v1.2.3