From 457f6ddffc905d44d0c7a422d6a0caf7372bc0de Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Fri, 4 Jan 2013 09:14:24 -0800
Subject: [PATCH] mixed line ending fix

---
 indra/newview/llfloaterpreference.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 4d10a4c136..746d8258e4 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -685,16 +685,16 @@ LLFloaterPreference::~LLFloaterPreference()
 	*/
 }
 
-//void LLFloaterPreference::draw()
-//{
-//	BOOL has_first_selected = (getChildRef<LLScrollListCtrl>("disabled_popups").getFirstSelected()!=NULL);
-//	gSavedSettings.setBOOL("FirstSelectedDisabledPopups", has_first_selected);
-//	
-//	has_first_selected = (getChildRef<LLScrollListCtrl>("enabled_popups").getFirstSelected()!=NULL);
-//	gSavedSettings.setBOOL("FirstSelectedEnabledPopups", has_first_selected);
-//	
-//	LLFloater::draw();
-//}
+//void LLFloaterPreference::draw()
+//{
+//	BOOL has_first_selected = (getChildRef<LLScrollListCtrl>("disabled_popups").getFirstSelected()!=NULL);
+//	gSavedSettings.setBOOL("FirstSelectedDisabledPopups", has_first_selected);
+//	
+//	has_first_selected = (getChildRef<LLScrollListCtrl>("enabled_popups").getFirstSelected()!=NULL);
+//	gSavedSettings.setBOOL("FirstSelectedEnabledPopups", has_first_selected);
+//	
+//	LLFloater::draw();
+//}
 
 void LLFloaterPreference::saveSettings()
 {