329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
a9a63db0f0
Merge branch 'master' into DRTVWR-548-maint-N
2022-08-31 00:17:37 +03:00
5c18921e9a
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
2022-08-31 00:16:09 +03:00
ed36165f29
SL-17584 Frame buffer object is now nessesary to run viewer
2022-06-15 18:03:11 +03:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
2ed401882e
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-05-26 02:56:29 +03:00
39ab2fb3fe
SL-16937 Replace sendAvatarPropertiesUpdate with profile cap in preferences
...
To avoid data loss, old api trims profile descriptions
2022-05-08 13:31:50 +03:00
29de643ffd
SL-15383 Controls table was empty after canceling advanced graphical settings
...
Also causes crashes on SearchableControl::setHighlighted due to views not being there
2022-04-26 22:02:00 +03:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
ea0c810d2d
SL-15312 Small tweaks for profiles
2022-04-18 23:39:21 +03:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
747dbb7da2
Merge branch 'master' into DRTVWR-540-maint
2021-12-26 14:01:06 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
bc95529003
SL-16369 Remove Hardware Skinning setting
2021-11-30 19:01:33 +02:00
ef0b48ce5a
SL-16119 Viewer should now direct IM 2 Email setting to web
2021-11-30 01:19:43 +02:00
49dd88e86c
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llviewerinput.cpp
2021-11-19 04:45:15 +02:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
f9373a9b4e
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
2021-11-16 00:54:53 +02:00
709184e0ff
SL-15993 Disabling transparent water should not disable advanced lighting
2021-11-12 17:34:27 +02:00
b41f6cd2b5
SL-15387 Resolve some columns crashes
...
Looks like mColumnsIndexed had dead pointers which resulted in a crash and there is some kind of hard to trigger interaction with searchable UI
2021-10-22 00:01:05 +03:00
8d64a0da52
SL-15383 Crash at SearchableControl's setHighlighted
2021-10-22 00:00:54 +03:00
84a0ae682a
SL-15611 Do not ignore mask modifiers for mouse-teleporting
2021-07-21 22:15:12 +03:00
b5d3a5b56a
SL-15353 'Cancel' button does not cancel 'Only friends and groups can call or IM me'
2021-06-15 20:37:23 +03:00
5b92d266df
SL-15383 Crash at SearchableControl's setHighlighted
2021-06-14 21:38:24 +03:00
e355f47d28
Merge branch 'master' into DRTVWR-521-maint
2021-04-01 20:48:28 +03:00
57c560fa0e
Merge branch 'master' into DRTVWR-521-maint
2021-02-17 21:23:31 +02:00
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
92af5af736
Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
2020-11-11 23:34:37 +02: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
1a4b66e89c
SL-14136 Mistake in llfloaterpreference.cpp
2020-10-16 19:04:13 +03: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
Andrey Lihatskiy