From 8a4b3e33cdd6f196f25e4acf86e80de08907590e Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 29 Jun 2011 13:13:10 -0700
Subject: EXP-961 FIX Keyboard definition file keys.xml contains invalid XML
 markup

---
 indra/newview/app_settings/keys.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/keys.xml')

diff --git a/indra/newview/app_settings/keys.xml b/indra/newview/app_settings/keys.xml
index d085475c6c..101deea55b 100644
--- a/indra/newview/app_settings/keys.xml
+++ b/indra/newview/app_settings/keys.xml
@@ -181,7 +181,7 @@
     <binding key="PAD_DIVIDE" mask="CTL_ALT_SHIFT" command="start_gesture"/>
   </third_person>
 
-  # Basic editing camera control
+  <-- Basic editing camera control -->
   <edit>
     <binding key="A" mask="NONE" command="spin_around_cw"/>
     <binding key="D" mask="NONE" command="spin_around_ccw"/>
-- 
cgit v1.2.3


From 2b2feaa929eda46bfeb4fe8baf2838e798ab35ac Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 29 Jun 2011 14:26:51 -0700
Subject: fixing key file comment - missing !

---
 indra/newview/app_settings/keys.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/keys.xml')

diff --git a/indra/newview/app_settings/keys.xml b/indra/newview/app_settings/keys.xml
index 101deea55b..6e3673e7d9 100644
--- a/indra/newview/app_settings/keys.xml
+++ b/indra/newview/app_settings/keys.xml
@@ -181,7 +181,7 @@
     <binding key="PAD_DIVIDE" mask="CTL_ALT_SHIFT" command="start_gesture"/>
   </third_person>
 
-  <-- Basic editing camera control -->
+  <!-- Basic editing camera control -->
   <edit>
     <binding key="A" mask="NONE" command="spin_around_cw"/>
     <binding key="D" mask="NONE" command="spin_around_ccw"/>
-- 
cgit v1.2.3