Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package Registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

8ccf7973

Commit 8ccf7973 authored 5 years ago by andreykproductengine

Downloads
- Patches
- Plain Diff

SL-6109 Fixed conflict resolution issue caused by menu accelerators

parent 317dd0e4

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/llmenugl.cpp 32 additions, 21 deletions

indra/llui/llmenugl.cpp
indra/llui/llmenugl.h 4 additions, 3 deletions

indra/llui/llmenugl.h
indra/newview/llkeyconflict.cpp 9 additions, 3 deletions

indra/newview/llkeyconflict.cpp
indra/newview/llsetkeybinddialog.cpp 42 additions, 11 deletions

indra/newview/llsetkeybinddialog.cpp
indra/newview/llsetkeybinddialog.h 8 additions, 1 deletion

indra/newview/llsetkeybinddialog.h
indra/newview/llviewerwindow.cpp 9 additions, 0 deletions

indra/newview/llviewerwindow.cpp

with 104 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment