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
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
f8137f68a0
Reverted SL-6109 keybinding changes
...
Changes were moved to DRTVWR-514
2020-06-23 16:55:06 +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
c5195905b8
SL-12554 FIXED The value of the 'Avatar Maximum Complexity' is not synchronized on different floaters while editing
2020-01-31 15:37:09 +02:00
49a2b3b5d7
SL-12594, remove conditional checks for VertexShaderEnable settings
2020-01-29 14:46:47 -07:00
a20a506bd1
SL-12594, rename some lingering VertexShaderEnable variables
2020-01-29 13:18:41 -07:00
18cdf4d269
SL-12594, remove Basic Shader checks
...
Remove checks for Vertex Shader capability and UI selection of no
Basic Shaders.
2020-01-29 10:18:51 -07:00
2a6b48c9b0
DRTVWR-440, merge in latest from 6.3.7 release
2020-01-28 17:26:45 -07:00
6d4bf05619
SL-12509 FIXED The Load, Save, and Delete preset floaters aren't opened together in the graphics preferences
2020-01-08 18:18:16 +02:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
b0265f9756
Merged in lindenlab/viewer-release
2019-12-13 02:21:48 +02:00
56056aa198
Upstream merge from viewer-neko
2019-11-27 23:20:03 +02:00
4b261a90ae
Merged in lindenlab/viewer-release
2019-11-14 23:46:15 +02:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
0bcb065623
SL-12271 FIXED Notifications are cropped after moving them to the 'Never show' box
2019-11-13 12:36:51 +02:00
5f731d84cb
Downstream merge from 494-maint-wassail
2019-11-12 02:37:15 +02:00
84f3b2865f
Merged in lindenlab/viewer-release
2019-11-12 00:39:07 +02:00
e8958a1c89
SL-6109 localization support for control table
2019-11-10 14:40:07 +02:00
1c2ab8938b
SL-12186 WIP Revert Preferences changes
2019-11-08 16:38:13 +02:00
6ba0b97c85
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
2019-11-07 20:09:25 +02:00
65f2c03923
SL-6109
...
- Fixed defaults not restoring reliably
- Fixed temporary changes not lifting reliably
- Fixed switching modes was dropping changes to mode we switch to
2019-11-04 15:48:45 +02:00
8e734f543b
SL-6109 Now changes are applied on the go and reverted on cancel
2019-10-30 20:48:54 +02:00
317dd0e405
SL-6109
...
- Fixed line endings in xml file
- Removed obsolete UI element and it's code
- Fixed issue with return value caused by rebase
2019-10-28 17:52:31 +02:00
6aab234105
SL-6109 Remade 'ignore' list processing, renamed and reformed keybindings
2019-10-03 22:45:29 +03:00
b8c5ae8d8f
SL-6109 Better menu accelerator support and slight reorganization
2019-10-03 19:46:12 +03:00
b6890180ea
SL-6109 Removed obsolete control, moved table init to xml, cleanup
2019-10-02 20:51:47 +03:00
fc03a5679e
SL-6109 Better hover and docking of keybinder
2019-10-01 22:23:49 +03:00
a8e56e67c3
SL-6109 Cleanup, run commands, and preparation for tooltip support
2019-09-27 19:53:33 +03:00
4080969968
SL-6109 Conflict resolution
2019-09-26 22:28:18 +03:00
8f35d638fb
SL-6109 LMB DLMB in progress
2019-09-25 22:23:09 +03:00
08969001e2
SL-6109 Mouse support ready
2019-09-25 17:54:36 +03:00
Andrey Lihatskiy