summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-06-29 13:13:32 -0700
committerRichard Linden <none@none>2011-06-29 13:13:32 -0700
commitd3922f8e494e0858c8f346128f9d2c5e0377c1b8 (patch)
tree0d95ade82defe94ddb1f58f376117944a27acd95 /indra
parentc998f21c5201a4c117ad601fbd23c116fd9faa04 (diff)
parent8a4b3e33cdd6f196f25e4acf86e80de08907590e (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/keys.xml2
1 files changed, 1 insertions, 1 deletions
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"/>