Conflicts: indra/newview/llviewerwindow.cpp c_str() dropped out (50f03d83c0). Added it back.
50f03d83c0