Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

indra/llui/llcombobox.cpp

@@ -700,7 +700,7 @@ void LLComboBox::hideList()
 #if 0	// Don't do this! mTextEntry->getText() can be truncated, in which case selectItemByLabel
 	// fails and this only resets the selection :/
 
-	//*HACK: store the original value explicitly somewhere, not just in label
+	// *HACK: store the original value explicitly somewhere, not just in label
 	std::string orig_selection = mAllowTextEntry ? mTextEntry->getText() : mButton->getLabelSelected();
 
 	// assert selection in list

indra/llui/llfloater.cpp

@@ -1663,7 +1663,7 @@ void LLFloater::updateButtons()
 		mButtons[i]->setEnabled(mButtonsEnabled[i]);
 
 		if (mButtonsEnabled[i] 
-			//*HACK: always render close button for hosted floaters
+			// *HACK: always render close button for hosted floaters
 			// so that users don't accidentally hit the button when closing multiple windows
 			// in the chatterbox
 			|| (i == BUTTON_CLOSE && mButtonScale != 1.f))

indra/llui/llmenugl.cpp

@@ -30,7 +30,7 @@
  * $/LicenseInfo$
  */
 
-//*****************************************************************************
+// *****************************************************************************
 //
 // This file contains the opengl based menu implementation.
 //
@@ -39,7 +39,7 @@
 // column is used for displaying boolean values for toggle and check
 // controls. The right column is used for submenus.
 //
-//*****************************************************************************
+// *****************************************************************************
 
 //#include "llviewerprecompiledheaders.h"
 #include "linden_common.h"

indra/llui/llpanel.cpp

@@ -623,7 +623,7 @@ std::string LLPanel::getString(const std::string& name, const LLStringUtil::form
 		formatted_string.setArgList(args);
 		return formatted_string.getString();
 	}
-	std::string err_str("Failed to find string " + name + " in panel " + getName()); //*TODO: Translate
+	std::string err_str("Failed to find string " + name + " in panel " + getName()); // *TODO: Translate
 	// *TODO: once the QAR-369 ui-cleanup work on settings is in we need to change the following line to be
 	//if(LLUI::sConfigGroup->getBOOL("QAMode"))
 	if(LLUI::sQAMode)
@@ -644,7 +644,7 @@ std::string LLPanel::getString(const std::string& name) const
 	{
 		return found_it->second;
 	}
-	std::string err_str("Failed to find string " + name + " in panel " + getName()); //*TODO: Translate
+	std::string err_str("Failed to find string " + name + " in panel " + getName()); // *TODO: Translate
 	if(LLUI::sQAMode)
 	{
 		llerrs << err_str << llendl;

indra/llui/llradiogroup.cpp

@@ -47,11 +47,9 @@
 static LLRegisterWidget<LLRadioGroup> r("radio_group");
 
 LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect,
-						   const std::string& control_name,
-						   LLUICtrlCallback callback,
-						   void* userdata,
-						   BOOL border)
-:	LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP),
+			   const std::string& control_name, LLUICtrlCallback callback,
+			   void* userdata, BOOL border) :
+	LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP),
 	mSelectedIndex(0)
 {
 	setControlName(control_name, NULL);
@@ -59,10 +57,8 @@ LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect,
 }
 
 LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect,
-						   S32 initial_index,
-						   LLUICtrlCallback callback,
-						   void* userdata,
-						   BOOL border) :
+			   S32 initial_index,  LLUICtrlCallback callback,
+			   void* userdata,   BOOL border) :
 	LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP),
 	mSelectedIndex(initial_index)
 {
@@ -74,10 +70,8 @@ void LLRadioGroup::init(BOOL border)
 	if (border)
 	{
 		addChild( new LLViewBorder( std::string("radio group border"), 
-									LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), 
-									LLViewBorder::BEVEL_NONE, 
-									LLViewBorder::STYLE_LINE, 
-									1 ) );
+					LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), 
+					LLViewBorder::BEVEL_NONE, LLViewBorder::STYLE_LINE, 1 ));
 	}
 	mHasBorder = border;
 }
@@ -257,8 +251,7 @@ void LLRadioGroup::draw()
 LLRadioCtrl* LLRadioGroup::addRadioButton(const std::string& name, const std::string& label, const LLRect& rect, const LLFontGL* font )
 {
 	// Highlight will get fixed in draw method above
-	LLRadioCtrl* radio = new LLRadioCtrl(name, rect, label, font,
-		onClickButton, this);
+	LLRadioCtrl* radio = new LLRadioCtrl(name, rect, label, font, onClickButton, this);
 	addChild(radio);
 	mRadioButtons.push_back(radio);
 	return radio;

indra/llui/llscrolllistctrl.cpp

@@ -299,7 +299,7 @@ S32 LLScrollListSeparator::getHeight() const
 
 void LLScrollListSeparator::draw(const LLColor4& color, const LLColor4& highlight_color) const
 {
-	//*FIXME: use dynamic item heights and make separators narrow, and inactive
+	// *FIXME: use dynamic item heights and make separators narrow, and inactive
 	gl_line_2d(5, 8, llmax(5, getWidth() - 5), 8, color);
 }