Andrey Lihatskiy
|
6d077c90a0
|
Merge branch 'main' into DRTVWR-588-maint-W
|
2024-03-01 17:30:06 +02:00 |
|
Alexander Gavriliuk
|
e7f1466a7b
|
Merge branch main into DRTVWR-489
|
2023-10-08 14:01:05 +02:00 |
|
Andrey Lihatskiy
|
13f1273c1d
|
Merge branch 'main' into DRTVWR-588-maint-W
# Conflicts:
# indra/llui/lltooltip.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/textures/textures.xml
|
2023-10-03 19:42:47 +03:00 |
|
Andrey Kleshchev
|
3d73a10da3
|
Merge branch main (DRTVWR-582) into DRTVWR-567
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
|
2023-08-23 22:40:17 +03:00 |
|
Nat Goodspeed
|
6cf6f81ae8
|
DRTVWR-588: Merge branch 'fix-monterey' into DRTVWR-588-monterey
|
2023-08-16 08:25:50 -04:00 |
|
Mnikolenko Productengine
|
97d5063cb1
|
SL-19982 Update font for menu items; show object's name in lsl editor
|
2023-08-02 14:29:46 +03:00 |
|
Callum Prentice
|
c5d7f3c4c1
|
DRTVWR-489: trivial merge conflict fix
|
2023-07-18 10:51:51 -07:00 |
|
Andrey Lihatskiy
|
07ff9a5d67
|
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
|
2023-07-17 23:17:29 +03:00 |
|
Nat Goodspeed
|
b61ea595b5
|
SL-18837: Clean up more set-but-unused variables for Xcode 14.3
|
2023-05-19 17:33:27 -04:00 |
|
Andrey Kleshchev
|
cc8af5f37d
|
SL-19649 Adjust other classes for new deleteAllChildren mechanics
|
2023-05-18 23:48:39 +03:00 |
|
Andrey Kleshchev
|
6e2e9d5904
|
SL-19649 Adjust other classes for new deleteAllChildren mechanics
|
2023-05-12 19:01:44 +03:00 |
|
Callum Prentice
|
28b240fd7f
|
DRTVWR-489: Fix things up after a messy merge with main because of a gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
|
2023-04-03 14:58:58 -07:00 |
|
Maxim Nikolenko
|
4f5d7f1256
|
SL-19105 WIP Allow setting on_visible in XML for menu separator
|
2023-02-20 18:42:46 +02:00 |
|
Rye Mutt
|
1fb1a9df7a
|
Fix leak of context menu branches
Introduce menu bloat logging code
|
2022-10-19 16:21:01 -04:00 |
|
Andrey Lihatskiy
|
77ce594dec
|
Merge branch 'master' into DRTVWR-544-maint
|
2022-06-29 20:31:17 +03:00 |
|
Mnikolenko Productengine
|
ace1b6b858
|
SL-17270 FIXED Torn-off menus not getting update after operation
|
2022-04-23 01:19:05 +03:00 |
|
Andrey Lihatskiy
|
dbb044e9bb
|
Merge branch 'master' into DRTVWR-543-maint
|
2022-04-18 20:38:06 +03:00 |
|
Andrey Kleshchev
|
1d6bfb727a
|
SL-16022 Fixed Tab not cycling through all options
|
2021-09-21 21:59:02 +03:00 |
|
Mnikolenko Productengine
|
01be43b7cd
|
SL-15426 FIXED Tear off menu visible during logout
|
2021-08-03 17:27:53 +03: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 |
|
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 |
|
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 |
|
Mnikolenko Productengine
|
94cd34cc17
|
SL-13479 Avatar menu tweaks
|
2020-11-24 04:17:45 +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 |
|
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 |
|
AndreyL ProductEngine
|
56056aa198
|
Upstream merge from viewer-neko
|
2019-11-27 23:20:03 +02:00 |
|
Dave Houlton
|
dc1453af9c
|
Merge in from viewer-release 6.3.5
|
2019-11-13 16:46:27 -07:00 |
|
AndreyL ProductEngine
|
5f731d84cb
|
Downstream merge from 494-maint-wassail
|
2019-11-12 02:37:15 +02:00 |
|
andreykproductengine
|
8ccf79735e
|
SL-6109 Fixed conflict resolution issue caused by menu accelerators
|
2019-10-28 18:27:13 +02:00 |
|
andreykproductengine
|
b8c5ae8d8f
|
SL-6109 Better menu accelerator support and slight reorganization
|
2019-10-03 19:46:12 +03:00 |
|
andreykproductengine
|
204d9c35e0
|
SL-1171 [Dev tools] UI controls <-> settings connection issues
|
2019-08-30 19:06:30 +03:00 |
|
andreykproductengine
|
fc238f6ca0
|
SL-6109 Extended Key-to-string functionality
|
2019-09-19 16:59:23 +03:00 |
|
andreykproductengine
|
c61d0f4297
|
DRTVWR-493 LLUI to LLParamSingleton
|
2019-08-10 15:31:03 +03:00 |
|
Graham Linden
|
470d1595cc
|
Merge viewer-release
|
2019-05-08 09:30:39 -07:00 |
|
Rider Linden
|
64e45b5b6e
|
SL-10041, SL-9758: Environment tab is disabled(shows can't do this) when EM does not allow parcel override. "Commit" button now reads "Apply to Parcel" or "Apply to Region" as needed.
|
2019-01-04 17:10:28 -08:00 |
|
AndreyL ProductEngine
|
09b750483a
|
SL-10293 Firestorm PR: preferences and menu search
|
2019-01-03 22:59:49 +02:00 |
|
Mnikolenko Productengine
|
f34bee5966
|
MAINT-1094 FIXED after triggering a menu with control-F10, clicking in-world should move keyboard focus in-world
|
2017-05-22 16:45:33 +03:00 |
|
andreykproductengine
|
fd756828a7
|
MAINT-3509 Fixed Context menu orphaned when Inventory floater is closed by keyboard shortcut
|
2017-02-24 17:41:39 +02:00 |
|
Mnikolenko Productengine
|
942bbf943d
|
MAINT-7029 Pop-up menu isn't shown in Place profile if all menu items are disabled
|
2017-01-05 11:45:17 +02:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
andreykproductengine
|
76165eed99
|
MAINT-839 added double click 'support'
|
2015-09-07 17:42:42 +03:00 |
|
Mnikolenko ProductEngine
|
b67e96de85
|
MAINT-302 FIXED Login screen menus flicker when mouse hovers over them
|
2015-07-02 11:50:52 +03:00 |
|
andreykproductengine
|
987b9fdae2
|
MAINT-839 FIXED [PUBLIC]Clicking at menu a second time does not close it.
|
2015-05-27 18:16:51 +03:00 |