Merge pull request #1477 from secondlife/marchcat/x-c-merge

Maint X -> Maint C merge

1 files changed, 29 insertions, 29 deletions

diff --git a/indra/newview/llscripteditor.h b/indra/newview/llscripteditor.h
index ef941f552a..19caa277d9 100644
--- a/indra/newview/llscripteditor.h
+++ b/indra/newview/llscripteditor.h
@@ -33,43 +33,43 @@
 class LLScriptEditor : public LLTextEditor
 {
 public:
-	
-	struct Params : public LLInitParam::Block<Params, LLTextEditor::Params>
-	{
-		Optional<bool>		show_line_numbers;
+
+    struct Params : public LLInitParam::Block<Params, LLTextEditor::Params>
+    {
+        Optional<bool>      show_line_numbers;
         Optional<bool> default_font_size;
-		Params();
-	};
-	
-	virtual ~LLScriptEditor() {};
-	
-	// LLView override
-	virtual void	draw();
+        Params();
+    };
+
+    virtual ~LLScriptEditor() {};
+
+    // LLView override
+    virtual void    draw();
     BOOL postBuild();
-	
-	void	initKeywords();
-	void	loadKeywords();
-	/* virtual */ void	clearSegments();
-	LLKeywords::keyword_iterator_t keywordsBegin()	{ return mKeywords.begin(); }
-	LLKeywords::keyword_iterator_t keywordsEnd()	{ return mKeywords.end(); }
-	
+
+    void    initKeywords();
+    void    loadKeywords();
+    /* virtual */ void  clearSegments();
+    LLKeywords::keyword_iterator_t keywordsBegin()  { return mKeywords.begin(); }
+    LLKeywords::keyword_iterator_t keywordsEnd()    { return mKeywords.end(); }
+
     static std::string getScriptFontSize();
     LLFontGL* getScriptFont();
     void onFontSizeChange();
 
   protected:
-	friend class LLUICtrlFactory;
-	LLScriptEditor(const Params& p);
-	
+    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;
+    void    drawLineNumbers();
+    /* virtual */ void  updateSegments();
+    /* virtual */ void  drawSelectionBackground();
+    void    loadKeywords(const std::string& filename_keywords,
+                         const std::string& filename_colors);
+
+    LLKeywords  mKeywords;
+    bool        mShowLineNumbers;
     bool mUseDefaultFontSize;
 };