Merge remote branch 'mccabe/1.3.0-next' into next

Conflicts:
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/skins/default/xui/de/floater_about.xml
	linden/indra/newview/skins/default/xui/fr/floater_about.xml
	linden/indra/newview/skins/default/xui/ja/floater_about.xml
	linden/indra/newview/skins/default/xui/ko/floater_about.xml
	linden/indra/newview/skins/default/xui/zh/floater_about.xml
	linden/install.xml

1 files changed, 5 insertions, 3 deletions

diff --git a/linden/indra/newview/llpreviewgesture.h b/linden/indra/newview/llpreviewgesture.h
index a5b8492..c245c0e 100644
--- a/linden/indra/newview/llpreviewgesture.h
+++ b/linden/indra/newview/llpreviewgesture.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -33,6 +34,7 @@
 #define LL_LLPREVIEWGESTURE_H
 
 #include "llpreview.h"
+#include "llmultigesture.h"
 
 class LLMultiGesture;
 class LLLineEditor;
@@ -101,14 +103,14 @@ protected:
                                                            void* user_data,
                                                            S32 status, LLExtStat ext_status);
 
-        static void handleSaveChangesDialog(S32 option, void* userdata);
+        bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response);
 
         // Write UI back into gesture
         LLMultiGesture* createGesture();
 
         // Add a step.  Pass the name of the step, like "Animation",
         // "Sound", "Chat", or "Wait"
-        LLScrollListItem* addStep(const std::string& step_name);
+        LLScrollListItem* addStep(const enum EStepType step_type);
 
         static void updateLabel(LLScrollListItem* item);