Fix some line-endings to be newline only.

3 files changed, 61 insertions, 61 deletions

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index de6bb23783..b9133c5a35 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -1690,44 +1690,44 @@ void LLLineEditor::doDelete()
 }
 
 
-void LLLineEditor::drawBackground()

-{

-	F32 alpha = getCurrentTransparency();

-	if (mUseBgColor)

-	{

-		gl_rect_2d(getLocalRect(), mBgColor % alpha, TRUE);

-	}

-	else

-	{

-		bool has_focus = hasFocus();

-		LLUIImage* image;

-		if (mReadOnly)

-		{

-			image = mBgImageDisabled;

-		}

-		else if (has_focus || mShowImageFocused)

-		{

-			image = mBgImageFocused;

-		}

-		else

-		{

-			image = mBgImage;

-		}

-

-		if (!image) return;

-		// optionally draw programmatic border

-		if (has_focus)

-		{

-			LLColor4 tmp_color = gFocusMgr.getFocusColor();

-			tmp_color.setAlpha(alpha);

-			image->drawBorder(0, 0, getRect().getWidth(), getRect().getHeight(),

-				tmp_color,

-				gFocusMgr.getFocusFlashWidth());

-		}

-		LLColor4 tmp_color = UI_VERTEX_COLOR;

-		tmp_color.setAlpha(alpha);

-		image->draw(getLocalRect(), tmp_color);

-	}

+void LLLineEditor::drawBackground()
+{
+	F32 alpha = getCurrentTransparency();
+	if (mUseBgColor)
+	{
+		gl_rect_2d(getLocalRect(), mBgColor % alpha, TRUE);
+	}
+	else
+	{
+		bool has_focus = hasFocus();
+		LLUIImage* image;
+		if (mReadOnly)
+		{
+			image = mBgImageDisabled;
+		}
+		else if (has_focus || mShowImageFocused)
+		{
+			image = mBgImageFocused;
+		}
+		else
+		{
+			image = mBgImage;
+		}
+
+		if (!image) return;
+		// optionally draw programmatic border
+		if (has_focus)
+		{
+			LLColor4 tmp_color = gFocusMgr.getFocusColor();
+			tmp_color.setAlpha(alpha);
+			image->drawBorder(0, 0, getRect().getWidth(), getRect().getHeight(),
+				tmp_color,
+				gFocusMgr.getFocusFlashWidth());
+		}
+		LLColor4 tmp_color = UI_VERTEX_COLOR;
+		tmp_color.setAlpha(alpha);
+		image->draw(getLocalRect(), tmp_color);
+	}
 }
 
 void LLLineEditor::draw()
diff --git a/indra/newview/llfloatermyenvironment.cpp b/indra/newview/llfloatermyenvironment.cpp
index af71329607..1d2f14532d 100644
--- a/indra/newview/llfloatermyenvironment.cpp
+++ b/indra/newview/llfloatermyenvironment.cpp
@@ -162,14 +162,14 @@ void LLFloaterMyEnvironment::onOpen(const LLSD& key)
 }
 
 //-------------------------------------------------------------------------
-void LLFloaterMyEnvironment::onShowFoldersChange()

-{

-    bool show_check(getChild<LLCheckBoxCtrl>(CHECK_SHOWFOLDERS)->getValue().asBoolean());

-

-    mShowFolders = (show_check) ? LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS;

-

-    if (mInventoryList)

-        mInventoryList->setShowFolderState(mShowFolders);

+void LLFloaterMyEnvironment::onShowFoldersChange()
+{
+    bool show_check(getChild<LLCheckBoxCtrl>(CHECK_SHOWFOLDERS)->getValue().asBoolean());
+
+    mShowFolders = (show_check) ? LLInventoryFilter::SHOW_ALL_FOLDERS : LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS;
+
+    if (mInventoryList)
+        mInventoryList->setShowFolderState(mShowFolders);
 }
 
 void LLFloaterMyEnvironment::onFilterCheckChange()
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index 46894ded80..6aff387dcb 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -124,21 +124,21 @@
         </layout_panel>
         <layout_panel
                 auto_resize="false"
-                user_resize="false"

-                tab_group="1"

-                height="15">

-            <check_box

-                    follows="left|bottom"

-                    height="14"

-                    initial_value="false"

-                    label="Show All Folders"

-                    layout="topleft"

-                    name="chk_showfolders"

-                    top="2"

-                    left_delta="-1"

-                    width="200" />

-        </layout_panel>

-        <layout_panel

+                user_resize="false"
+                tab_group="1"
+                height="15">
+            <check_box
+                    follows="left|bottom"
+                    height="14"
+                    initial_value="false"
+                    label="Show All Folders"
+                    layout="topleft"
+                    name="chk_showfolders"
+                    top="2"
+                    left_delta="-1"
+                    width="200" />
+        </layout_panel>
+        <layout_panel
                 auto_resize="false"
                 tab_group="1"
                 height="31"