From c57cd2fa14f4134bd35c4a640caf98b8e6f2edb9 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Sun, 7 Jun 2009 01:28:59 +0000
Subject: [PATCH] accept 'utf-8' as well as 'utf8'

---
 panda/src/express/textEncoder.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panda/src/express/textEncoder.cxx b/panda/src/express/textEncoder.cxx
index 127bbd89f4..5257897383 100644
--- a/panda/src/express/textEncoder.cxx
+++ b/panda/src/express/textEncoder.cxx
@@ -374,7 +374,7 @@ operator >> (istream &in, TextEncoder::Encoding &encoding) {
 
   if (word == "iso8859") {
     encoding = TextEncoder::E_iso8859;
-  } else if (word == "utf8") {
+  } else if (word == "utf8" || word == "utf-8") {
     encoding = TextEncoder::E_utf8;
   } else if (word == "unicode") {
     encoding = TextEncoder::E_unicode;