SOCIAL-395 (FIX) LLWebContentFloater not handling Javascript size and window position parameters in

Change to llfloaterwebcontent.cpp is a whitespace change only to fix a broken checkin

1 files changed, 25 insertions, 25 deletions

diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 9eb5d1e883..14bd5baba1 100644
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -75,28 +75,28 @@ BOOL LLFloaterWebContent::postBuild()
 	return TRUE;

 }

 

-void LLFloaterWebContent::initializeURLHistory()
-{
-	// start with an empty list
-	LLCtrlListInterface* url_list = childGetListInterface("address");
-	if (url_list)
-	{
-		url_list->operateOnAll(LLCtrlListInterface::OP_DELETE);
-	}
-
-	// Get all of the entries in the "browser" collection
-	LLSD browser_history = LLURLHistory::getURLHistory("browser");
-	LLSD::array_iterator iter_history =
-		browser_history.beginArray();
-	LLSD::array_iterator end_history =
-		browser_history.endArray();
-	for(; iter_history != end_history; ++iter_history)
-	{
-		std::string url = (*iter_history).asString();
-		if(! url.empty())
-			url_list->addSimpleElement(url);
-	}
-}
+void LLFloaterWebContent::initializeURLHistory()

+{

+	// start with an empty list

+	LLCtrlListInterface* url_list = childGetListInterface("address");

+	if (url_list)

+	{

+		url_list->operateOnAll(LLCtrlListInterface::OP_DELETE);

+	}

+

+	// Get all of the entries in the "browser" collection

+	LLSD browser_history = LLURLHistory::getURLHistory("browser");

+	LLSD::array_iterator iter_history =

+		browser_history.beginArray();

+	LLSD::array_iterator end_history =

+		browser_history.endArray();

+	for(; iter_history != end_history; ++iter_history)

+	{

+		std::string url = (*iter_history).asString();

+		if(! url.empty())

+			url_list->addSimpleElement(url);

+	}

+}

 

 //static

 void LLFloaterWebContent::create( const std::string &url, const std::string& target, const std::string& uuid )

@@ -334,9 +334,9 @@ void LLFloaterWebContent::set_current_url(const std::string& url)
 {

 	mCurrentURL = url;

 

-	// serialize url history into the system URL History manager
-	LLURLHistory::removeURL("browser", mCurrentURL);
-	LLURLHistory::addURL("browser", mCurrentURL);
+	// serialize url history into the system URL History manager

+	LLURLHistory::removeURL("browser", mCurrentURL);

+	LLURLHistory::addURL("browser", mCurrentURL);

 

 	mAddressCombo->remove( mCurrentURL );

 	mAddressCombo->add( mCurrentURL );