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

Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp
This commit is contained in:
Siana Gearz
2012-11-12 06:46:58 +01:00
200 changed files with 19362 additions and 3255 deletions

View File

@@ -2443,7 +2443,6 @@ BOOL LLLineEditor::evaluateFloat()
{
bool success = false;
std::string expr = getText();
LLStringUtil::toUpper(expr);
// user deleted the contents, nothing to evaluate -- MC
if (expr.empty())