Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer

Conflicts: indra/newview/skins/default/xui/en-us/strings.xml
2012-08-09 03:04:13 +02:00
parent c84e145557 769a7b89d2
commit 7743843a27
41 changed files with 3358 additions and 2289 deletions
--- a/indra/llrender/llpostprocess.cpp
+++ b/indra/llrender/llpostprocess.cpp
@@ -571,7 +571,7 @@ void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD& va
 	S32 elem=0;
 	if(sscanf(setting.c_str(),"%255[^[][%d]", buf, &elem) == 2)
 	{
-		mSelectedEffectInfo[(char*)buf][elem] = value;
+		mSelectedEffectInfo[std::string(buf)][elem] = value;
 	}
 	else
 	{