003f396d2f
Merge branch 'master' into DRTVWR-514-keymappings
2021-02-17 21:22:22 +02:00
e3de5de3c1
Merge remote-tracking branch 'origin/master' into DRTVWR-517
2020-11-13 13:59:36 +00:00
74c3b7a0ee
Merged master (DRTVWR-507) into DRTVWR-514-keymappings
2020-11-11 22:16:04 +02:00
caea7260c7
SL-14142 - impostor management cleanup
2020-10-20 18:56:44 +01:00
825cfc2b6a
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
c2b55c4362
Merged master(DRTVWR-503) into DRTVWR-514-keymappings
2020-09-22 22:54:36 +03:00
c3b1eadf88
Merge branch 'master' into DRTVWR-514-keymappings
2020-08-18 19:45:23 +03:00
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
b495608a83
SL-12554 FIXED The value of the 'Avatar Maximum Complexity' is not synchronized after closing Advanced settings via Close btn
2020-07-09 18:07:57 +03:00
b8127f80c7
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/llcommon/llkeybind.cpp
# indra/llcommon/llkeybind.h
2020-06-24 00:08:35 +03:00
7717097f7c
SL-6109 Teleport and autopilot should not work in some cases
...
Hides teleport_to and walk_to also optimizes couple things.
2020-06-23 20:29:00 +03:00
f8137f68a0
Reverted SL-6109 keybinding changes
...
Changes were moved to DRTVWR-514
2020-06-23 16:55:06 +03:00
f6662ffb26
SL-13469 Fixed use of wrong clear function
2020-06-23 14:51:30 +03:00
74aba5768e
SL-13418 Move and view panel now applies changes on the go
2020-06-23 14:51:30 +03:00
e578491be7
SL-13418 Restored previously removed 'click on land' controls from 'move & view'
...
According to UX UI engineer. Also adapted it to new system, but it needs a better solution.
2020-06-23 14:51:30 +03:00
c604b274fb
SL-13421 Separated some sitting-exclusive controls
2020-06-23 14:51:29 +03:00
629cd92c47
SL-13421 Removed camera control keybindings from mouselook
2020-06-23 14:51:29 +03:00
e7d383be8a
SL-6109 localization support for control table
2020-06-23 14:50:05 +03:00
73a1877ff0
SL-6109
...
- Edit mode appears to be obsolete and is not used, cleaned up
- Improved ability to set defaults
- Improved some labels
- Made buttons bigger to accomodate languages with longer descriptions
- Added ability to assign key for all modes simultaneously
2020-06-23 14:50:04 +03:00
b5b266c4d2
SL-6109
...
- Fixed defaults not restoring reliably
- Fixed temporary changes not lifting reliably
- Fixed switching modes was dropping changes to mode we switch to
2020-06-23 14:50:04 +03:00
7a14cf4203
SL-6109 Now changes are applied on the go and reverted on cancel
2020-06-23 14:50:03 +03:00
6597c76967
SL-6109
...
- Fixed line endings in xml file
- Removed obsolete UI element and it's code
- Fixed issue with return value caused by rebase
2020-06-23 14:50:03 +03:00
e211372923
SL-6109 Remade 'ignore' list processing, renamed and reformed keybindings
2020-06-23 14:50:02 +03:00
13a25be08f
SL-6109 Better menu accelerator support and slight reorganization
2020-06-23 14:50:02 +03:00
2e656ed358
SL-6109 Removed obsolete control, moved table init to xml, cleanup
2020-06-23 14:49:40 +03:00
04081c0bc8
SL-6109 Better hover and docking of keybinder
2020-06-23 14:49:40 +03:00
0b80218703
SL-6109 Cleanup, run commands, and preparation for tooltip support
2020-06-23 14:48:04 +03:00
2532a2ee9e
SL-6109 Conflict resolution
2020-06-23 14:48:03 +03:00
4ae2165c45
SL-6109 LMB DLMB in progress
2020-06-23 14:48:03 +03:00
c60b929fbb
SL-6109 Mouse support ready
2020-06-23 14:48:03 +03:00
4df05c5a89
SL-6109 Keyaboard support ready
2020-06-23 14:48:02 +03:00
3633ccf1a1
SL_6109 Rebinding
2020-06-23 14:48:02 +03:00
b9294516fc
SL-6109 Implement keybindings
2020-06-23 14:48:02 +03:00
1b744fb2a6
SL-13469 Fixed use of wrong clear function
2020-06-17 09:51:05 +03:00
71b66c758e
SL-13418 Move and view panel now applies changes on the go
2020-06-16 09:52:20 +03:00
b291bc32e9
SL-13418 Restored previously removed 'click on land' controls from 'move & view'
...
According to UX UI engineer. Also adapted it to new system, but it needs a better solution.
2020-06-15 23:58:18 +03:00
ceea2df596
SL-13421 Separated some sitting-exclusive controls
2020-06-12 20:09:43 +03:00
b1f9de4d37
SL-13421 Removed camera control keybindings from mouselook
2020-06-12 18:51:13 +03:00
aaaf3189c4
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
2020-05-19 22:37:41 +03:00
6c79fdd695
Merge branch 'master' into DRTVWR-507-maint
2020-05-19 10:49:11 +03:00
510574dc14
Merge branch 'master' into DRTVWR-501-maint
...
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.cpp
2020-05-18 23:41:19 +03:00
3e72ded044
SL-12007 Missed transparent water in LLFloaterPreference
2020-05-18 22:18:48 +03:00
812e6285c5
SL-12007 Toggling 'Transparent water' checkbox has no effect
...
Opaque water is not compatible with ALM
2020-05-13 21:48:36 +03:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
b6441bf09b
Merge branch 'DRTVWR-500' into DRTVWR-501-maint
2020-04-29 19:34:39 +03:00
a0d7d87355
Merge branch 'master' into DRTVWR-460
...
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
2020-04-26 21:57:40 +03:00
790dff05d0
SL-12554 FIXED The value of the 'Avatar Maximum Complexity' is not synchronized after closing Advanced settings
2020-03-25 15:10:33 +02:00
6c41ea62ce
SL-12871 'Only Friends and Groups can call or IM me' setting should be account based.
2020-03-19 16:14:02 +02:00
ad63fa5ffa
Merge branch 'master' into DRTVWR-460
2020-02-05 18:30:40 +02:00
e0727702ea
Merge branch 'DRTVWR-501' into trunk
2020-02-03 15:18:34 +02:00
Andrey Lihatskiy