Merge remote-tracking branch 'lirusato/master' into 1.7.3-dev

2013-01-13 12:45:37 +01:00
parent 31d2a15957 ece92a1b7c
commit cef7ea9f5e
21 changed files with 333 additions and 41 deletions
--- a/indra/llui/llradiogroup.cpp
+++ b/indra/llui/llradiogroup.cpp
@@ -316,7 +316,8 @@ void LLRadioGroup::setValue( const LLSD& value )
 		}
 		else
 		{
-			llwarns << "LLRadioGroup::setValue: value not found: " << value_name << llendl;
+			llwarns << "LLRadioGroup::setValue: radio_item with name=\"" << value_name << "\" not found, radio_group values are set by radio_item name not value.  Falling back on LLUICtrl::setValue." << llendl;
+			LLUICtrl::setValue(value);
 		}
 	}
 }