Ansariel
|
a9c29b4b81
|
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmenugl.h
# indra/llui/lltexteditor.cpp
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llnetmap.cpp
|
2022-10-20 10:51:25 +02:00 |
|
Rye Mutt
|
1fb1a9df7a
|
Fix leak of context menu branches
Introduce menu bloat logging code
|
2022-10-19 16:21:01 -04:00 |
|
Ansariel
|
2f42e999e0
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
|
2022-08-31 16:04:49 +02:00 |
|
Ansariel
|
300a545354
|
Add some comments
|
2022-08-12 20:15:36 +02:00 |
|
Ansariel
|
178631838a
|
FIRE-31882 / FIRE-31896 / FIRE-31913 / FIRE-31920: Fix all kind of weird menu focus issues by undoing LL's garbage truck full of nonsense change
|
2022-08-12 20:11:36 +02:00 |
|
Ansariel
|
d7953c1e94
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-02 12:03:54 +02:00 |
|
Ansariel
|
51e40a9d42
|
FIRE-31823: Torn off menu doesn't update enabled/visible state
|
2022-07-25 13:50:19 +02:00 |
|
Ansariel
|
fc11575657
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
|
2022-06-29 20:28:29 +02:00 |
|
Andrey Lihatskiy
|
77ce594dec
|
Merge branch 'master' into DRTVWR-544-maint
|
2022-06-29 20:31:17 +03:00 |
|
Ansariel
|
633a851d74
|
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
|
2022-05-05 10:45:00 +02:00 |
|
Mnikolenko Productengine
|
ace1b6b858
|
SL-17270 FIXED Torn-off menus not getting update after operation
|
2022-04-23 01:19:05 +03:00 |
|
Ansariel
|
1aaa765d26
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-04-19 12:33:48 +02:00 |
|
Andrey Lihatskiy
|
dbb044e9bb
|
Merge branch 'master' into DRTVWR-543-maint
|
2022-04-18 20:38:06 +03:00 |
|
Ansariel
|
a0837a5298
|
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
|
2022-01-14 13:46:29 +01:00 |
|
Andrey Kleshchev
|
1d6bfb727a
|
SL-16022 Fixed Tab not cycling through all options
|
2021-09-21 21:59:02 +03:00 |
|
Ansariel
|
603e04ee3c
|
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-08-24 13:18:55 +02:00 |
|
Mnikolenko Productengine
|
01be43b7cd
|
SL-15426 FIXED Tear off menu visible during logout
|
2021-08-03 17:27:53 +03:00 |
|
Ansariel
|
48012f1ce7
|
FIRE-31065: Make sure menu is shown on the screen properly
|
2021-07-15 12:31:11 +02:00 |
|
Andrey Lihatskiy
|
5aec46243b
|
Merge branch 'master' into DRTVWR-540-maint
|
2021-06-25 01:02:22 +03:00 |
|
Andrey Kleshchev
|
da5cc13df2
|
SL-15410 Menu search breaks torn off menus
|
2021-06-18 20:15:51 +03:00 |
|
Ansariel
|
8afe22531d
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-04-30 23:42:57 +02:00 |
|
Andrey Lihatskiy
|
c54382b760
|
Merge branch 'master' into DRTVWR-518-ui
# Conflicts:
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/skins/default/xui/en/strings.xml
|
2021-04-29 20:04:33 +03:00 |
|
Ansariel
|
d271062749
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-04-02 16:53:23 +02:00 |
|
Ansariel
|
76a581ff0b
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-04-01 22:58:50 +02:00 |
|
Andrey Kleshchev
|
4c889f7e52
|
Merge branch 'master' (DRTVWR-514) into DRTVWR-518-ui
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
|
2021-04-01 21:34:44 +03:00 |
|
Andrey Lihatskiy
|
6240168f24
|
Merge branch 'master' into DRTVWR-515-maint
|
2021-04-01 20:45:06 +03:00 |
|
Ansariel
|
bdfa92fb91
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-02-03 19:50:18 +01:00 |
|
Ansariel
|
5bc39cd87d
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-02-02 17:50:49 +01:00 |
|
Ansariel
|
1461e9bbb0
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-01-17 19:24:26 +01:00 |
|
Ansariel
|
72f10f9ccf
|
FIRE-10883: Prevent context menu from going off screen
|
2020-12-11 11:06:15 +01:00 |
|
Ansariel
|
46d1c656b2
|
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
|
2020-11-24 11:56:39 +01:00 |
|
Mnikolenko Productengine
|
94cd34cc17
|
SL-13479 Avatar menu tweaks
|
2020-11-24 04:17:45 +02:00 |
|
Ansariel
|
daec926a54
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-12 17:02:25 +01:00 |
|
Ansariel
|
09609be3b7
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-10-19 23:28:54 +02:00 |
|
Ansariel
|
07deac24ea
|
Context menu memory leak fix by Rye Mutt
|
2020-10-18 22:21:41 +02:00 |
|
Ansariel
|
240757c0d0
|
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-08-20 16:52:04 +02:00 |
|
Ansariel
|
f48e395864
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-08-19 10:19:17 +02:00 |
|
Ansariel
|
5ae4be708a
|
FIRE-30003: (CTRL-)F10 can't be used as gesture trigger
|
2020-08-16 22:49:26 +02:00 |
|
Mnikolenko Productengine
|
2b219a0bd5
|
SL-13582 FIXED The Favorites bar overflow list is shifted after clicking any button on the context menu
|
2020-07-13 15:36:35 +03:00 |
|
Ansariel
|
ebe141327c
|
Merge branch 'DRTVWR-514-keymappings' of https://bitbucket.org/lindenlab/viewer
|
2020-06-24 10:30:51 +02:00 |
|
Andrey Kleshchev
|
f8137f68a0
|
Reverted SL-6109 keybinding changes
Changes were moved to DRTVWR-514
|
2020-06-23 16:55:06 +03:00 |
|
andreykproductengine
|
62214b53f0
|
SL-6109 Fixed conflict resolution issue caused by menu accelerators
|
2020-06-23 14:50:03 +03:00 |
|
andreykproductengine
|
13a25be08f
|
SL-6109 Better menu accelerator support and slight reorganization
|
2020-06-23 14:50:02 +03:00 |
|
andreykproductengine
|
5322f41250
|
SL-6109 Extended Key-to-string functionality
|
2020-06-23 14:46:15 +03:00 |
|
Andrey Lihatskiy
|
b6441bf09b
|
Merge branch 'DRTVWR-500' into DRTVWR-501-maint
|
2020-04-29 19:34:39 +03:00 |
|
Dave Houlton
|
2a6b48c9b0
|
DRTVWR-440, merge in latest from 6.3.7 release
|
2020-01-28 17:26:45 -07:00 |
|
Ansariel
|
da365b227e
|
Merge Firestorm LGPL
|
2019-12-13 18:15:19 +01:00 |
|
AndreyL ProductEngine
|
56056aa198
|
Upstream merge from viewer-neko
|
2019-11-27 23:20:03 +02:00 |
|
Ansariel
|
3bc189bda7
|
Merge Firestorm LGPL
|
2019-11-19 20:28:09 +01:00 |
|
Ansariel
|
0b6b4c7097
|
Merge Firestorm LGPL
|
2019-11-15 19:05:26 +01:00 |