diff options
| author | Tonya Souther <tonya.souther@gmail.com> | 2013-10-29 13:59:21 -0400 |
|---|---|---|
| committer | Tonya Souther <tonya.souther@gmail.com> | 2013-10-29 13:59:21 -0400 |
| commit | 07b5e702e67fd652ff7e2a681c34ec8e4e825921 (patch) | |
| tree | 0c8378e61a3da3beaf86133e6d243e45ca0b2a4f | |
| parent | 994ecbed340b3ffb5f37d377460188ae8da7710b (diff) | |
BUG-3968: do not wear an object when renaming in inventory
| -rwxr-xr-x | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/llwindow/llopenglview-objc.mm | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 33d213d7cb..08ed5929cb 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1259,6 +1259,8 @@ Tofu Buzzard Tony Kembia Tonya Souther STORM-1905 + BUG-3875 + BUG-3968 Torben Trautman TouchaHoney Perhaps TraductoresAnonimos Alter diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm index 7415c9d8dc..b393a3796d 100644 --- a/indra/llwindow/llopenglview-objc.mm +++ b/indra/llwindow/llopenglview-objc.mm @@ -376,13 +376,6 @@ attributedStringInfo getSegments(NSAttributedString *str) [[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. |