Fix up merge of llviewermessage.cpp between Shyotl/sunshine and Canon.