diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-14 02:47:44 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-14 02:47:44 +0200 |
| commit | 4b98ae6e8a4c54fa70246beb5d7ff28a5590e819 (patch) | |
| tree | 11e49d0cb85d8420ac614f039b32e5ec16202de3 /indra/llplugin | |
| parent | 0db9bcf21fd4b7172e8a35cdb2805ccdc736e273 (diff) | |
| parent | 07ace73c49918ffb70e99c2239849eaaabc1fe45 (diff) | |
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
# indra/newview/llspatialpartition.cpp
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/slplugin/slplugin-objc.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/slplugin/slplugin-objc.mm b/indra/llplugin/slplugin/slplugin-objc.mm index a5ab1d95c8..68ff196eaf 100644 --- a/indra/llplugin/slplugin/slplugin-objc.mm +++ b/indra/llplugin/slplugin/slplugin-objc.mm @@ -95,7 +95,7 @@ void LLCocoaPlugin::processEvents() { // Some plugins (webkit at least) will want an event loop. This qualifies. NSEvent * event; - event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES]; + event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES]; [NSApp sendEvent: event]; } |