diff -r af9300746a85 doc/contributions.txt
--- a/doc/contributions.txt	Thu Oct 03 18:03:25 2013 -0400
+++ b/doc/contributions.txt	Sun Oct 06 22:22:49 2013 -0500
@@ -1243,6 +1243,8 @@
 Tony Kembia
 Tonya Souther
 	STORM-1905
+	BUG-3875
+	BUG-3968
 Torben Trautman
 TouchaHoney Perhaps
 TraductoresAnonimos Alter
diff -r af9300746a85 indra/llwindow/llopenglview-objc.mm
--- a/indra/llwindow/llopenglview-objc.mm	Thu Oct 03 18:03:25 2013 -0400
+++ b/indra/llwindow/llopenglview-objc.mm	Sun Oct 06 22:22:49 2013 -0500
@@ -376,13 +376,6 @@
         [[self inputContext] handleEvent:theEvent];
     }
     
-    if ([[theEvent charactersIgnoringModifiers] characterAtIndex:0] == NSCarriageReturnCharacter ||
-        [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == NSEnterCharacter)
-    {
-        // callKeyDown won't return the value we expect for enter or return.  Handle them as a separate case.
-        [[self inputContext] handleEvent:theEvent];
-    }
-    
     // OS X intentionally does not send us key-up information on cmd-key combinations.
     // This behaviour is not a bug, and only applies to cmd-combinations (no others).
     // Since SL assumes we receive those, we fake it here.