merge changes for 3.7.12-release

1 files changed, 70 insertions, 0 deletions

diff --git a/indra/newview/llscripteditor.h b/indra/newview/llscripteditor.h
new file mode 100644
index 0000000000..f458203a39
--- /dev/null
+++ b/indra/newview/llscripteditor.h
@@ -0,0 +1,70 @@
+/**
+ * @file llscripteditor.h
+ * @author Cinder Roxley
+ * @brief Text editor widget used for viewing and editing scripts
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2012, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_SCRIPTEDITOR_H
+#define LL_SCRIPTEDITOR_H
+
+#include "lltexteditor.h"
+
+class LLScriptEditor : public LLTextEditor
+{
+public:
+	
+	struct Params : public LLInitParam::Block<Params, LLTextEditor::Params>
+	{
+		Optional<bool>		show_line_numbers;
+		
+		Params();
+	};
+	
+	virtual ~LLScriptEditor() {};
+	
+	// LLView override
+	virtual void	draw();
+	
+	void	initKeywords();
+	void	loadKeywords();
+	/* virtual */ void	clearSegments();
+	LLKeywords::keyword_iterator_t keywordsBegin()	{ return mKeywords.begin(); }
+	LLKeywords::keyword_iterator_t keywordsEnd()	{ return mKeywords.end(); }
+	
+protected:
+	friend class LLUICtrlFactory;
+	LLScriptEditor(const Params& p);
+	
+private:
+	void	drawLineNumbers();
+	/* virtual */ void	updateSegments();
+	/* virtual */ void	drawSelectionBackground();
+	void	loadKeywords(const std::string& filename_keywords,
+						 const std::string& filename_colors);
+	
+	LLKeywords	mKeywords;
+	bool		mShowLineNumbers;
+};
+
+#endif // LL_SCRIPTEDITOR_H