Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 20 insertions, 20 deletions

diff --git a/indra/newview/llfloatergotoline.cpp b/indra/newview/llfloatergotoline.cpp
index 3b34f03532..005a7b3d4a 100644
--- a/indra/newview/llfloatergotoline.cpp
+++ b/indra/newview/llfloatergotoline.cpp
@@ -43,7 +43,7 @@ LLFloaterGotoLine::LLFloaterGotoLine(LLScriptEdCore* editor_core)
         buildFromFile("floater_goto_line.xml");
 
         sInstance = this;
-        
+
         // find floater in which script panel is embedded
         LLView* viewp = (LLView*)editor_core;
         while(viewp)
@@ -60,9 +60,9 @@ LLFloaterGotoLine::LLFloaterGotoLine(LLScriptEdCore* editor_core)
 
 BOOL LLFloaterGotoLine::postBuild()
 {
-	mGotoBox = getChild<LLLineEditor>("goto_line");
-	mGotoBox->setCommitCallback(boost::bind(&LLFloaterGotoLine::onGotoBoxCommit, this));
-	mGotoBox->setCommitOnFocusLost(FALSE);
+    mGotoBox = getChild<LLLineEditor>("goto_line");
+    mGotoBox->setCommitCallback(boost::bind(&LLFloaterGotoLine::onGotoBoxCommit, this));
+    mGotoBox->setCommitOnFocusLost(FALSE);
         getChild<LLLineEditor>("goto_line")->setPrevalidate(LLTextValidate::validateNonNegativeS32);
         childSetAction("goto_btn", onBtnGoto,this);
         setDefaultBtn("goto_btn");
@@ -70,7 +70,7 @@ BOOL LLFloaterGotoLine::postBuild()
         return TRUE;
 }
 
-//static 
+//static
 void LLFloaterGotoLine::show(LLScriptEdCore* editor_core)
 {
         if (sInstance && sInstance->mEditorCore && sInstance->mEditorCore != editor_core)
@@ -93,7 +93,7 @@ LLFloaterGotoLine::~LLFloaterGotoLine()
         sInstance = NULL;
 }
 
-// static 
+// static
 void LLFloaterGotoLine::onBtnGoto(void *userdata)
 {
         LLFloaterGotoLine* self = (LLFloaterGotoLine*)userdata;
@@ -109,9 +109,9 @@ void LLFloaterGotoLine::handleBtnGoto()
         {
                 if (mEditorCore && mEditorCore->mEditor)
                 {
-			mEditorCore->mEditor->deselect();
-			mEditorCore->mEditor->setCursor(row, column);
-			mEditorCore->mEditor->setFocus(TRUE);
+            mEditorCore->mEditor->deselect();
+            mEditorCore->mEditor->setCursor(row, column);
+            mEditorCore->mEditor->setFocus(TRUE);
                 }
         }
 }
@@ -144,17 +144,17 @@ void LLFloaterGotoLine::onGotoBoxCommit()
         {
                 if (mEditorCore && mEditorCore->mEditor)
                 {
-			mEditorCore->mEditor->setCursor(row, column);
-
-			S32 rownew = 0;
-			S32 columnnew = 0;
-			mEditorCore->mEditor->getCurrentLineAndColumn( &rownew, &columnnew, FALSE );  // don't include wordwrap
-			if (rownew == row && columnnew == column)
-			{
-			        mEditorCore->mEditor->deselect();
-			        mEditorCore->mEditor->setFocus(TRUE);
-			        sInstance->closeFloater();
-			} //else do nothing (if the cursor-position didn't change)
+            mEditorCore->mEditor->setCursor(row, column);
+
+            S32 rownew = 0;
+            S32 columnnew = 0;
+            mEditorCore->mEditor->getCurrentLineAndColumn( &rownew, &columnnew, FALSE );  // don't include wordwrap
+            if (rownew == row && columnnew == column)
+            {
+                    mEditorCore->mEditor->deselect();
+                    mEditorCore->mEditor->setFocus(TRUE);
+                    sInstance->closeFloater();
+            } //else do nothing (if the cursor-position didn't change)
                 }
         }
 }