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

indra/newview/llimpanel.cpp

@@ -336,7 +336,7 @@ void LLVoiceCallCapResponder::result(const LLSD& content)
 	LLVoiceChannel* channelp = LLVoiceChannel::getChannelByID(mSessionID);
 	if (channelp)
 	{
-		//*TODO: DEBUG SPAM
+		// *TODO: DEBUG SPAM
 		LLSD::map_const_iterator iter;
 		for(iter = content.beginMap(); iter != content.endMap(); ++iter)
 		{
@@ -746,7 +746,7 @@ void LLVoiceChannelGroup::setChannelInfo(
 		}
 		else
 		{
-			//*TODO: notify user
+			// *TODO: notify user
 			llwarns << "Received invalid credentials for channel " << mSessionName << llendl;
 			deactivate();
 		}