21e2f3e974
Merge branch 'master' 6.4.12 into DRTVWR-510
2020-11-11 15:43:06 -07:00
d12305496f
DRTVWR-510 clean up obsolete downstream-from-mDebugGPU code
2020-10-19 17:21:56 -06:00
a6058b0e9f
DRTVWR-510 remove obsolete mDebugGPU variable
2020-10-19 17:21:56 -06:00
f22c85cb41
SL-13424 Add Rad Games Tools local Telemetry profiler support
2020-10-15 23:33:13 -07:00
7cd076c796
DRTVWR-510 remove all LL_SOLARIS conditionals
2020-10-08 17:16:22 -06:00
9ec688ae4d
SL-13500 loadShaderFile crash
2020-09-29 23:39:35 +03:00
a2cb61d9f4
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-09-28 22:08:48 +03:00
6d014dde5e
SL-14007 Group icon in "About land" displays wrong icon
2020-09-26 17:21:17 +03:00
056c41a408
SL-13034 removeMarkerFiles() happens in destructor
...
Depends onto SL-13979 for proper logging
2020-09-25 17:02:21 +03:00
3424a1f965
SL-13979 Crash of logging system at LLError::Settings::getInstance()
...
LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks
2020-09-25 13:54:06 +03:00
86e7cc3d35
Merge branch 'master' v6.4.9 into DRTVWR-497
2020-09-22 15:28:13 -06: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
6c1a15d936
SL-13565, clean up now-orphaned throttling variable and handling code
2020-08-20 17:08:15 -06:00
d77b7bdc54
SL-13565, remove SL-10625 throttling erroneously applied to all GPUs
...
Remove the sleep throttle applied in 10625 to work around an Intel GPU driver
bug. It was erroneously being applied to all GPUs, and also as of Intel driver
26.20.100.7755 (1/9/2020) it appears that the driver bug no longer exists.
2020-08-20 15:08:55 -06:00
9f0da75332
Merge branch 'master' 6.4.8 into DRTVWR-497
2020-08-18 11:29:17 -06:00
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
0c0ed56167
Merge branch 'master' 6.4.7 into DRTVWR-497
2020-08-13 11:09:26 -06:00
f29ac6757c
Merge branch 'master' into DRTVWR-507-maint
2020-08-11 01:35:04 +03:00
9406b757a3
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
c27e207033
SL-13737 Crash when cleaning up uninitialized ndof device
2020-08-06 17:46:53 +03:00
00acc562f9
Revert commit bbb16ff97c.
...
This fails at teamcity due to missing LLTrans, but builds locally without issues. Reverting to not hold D501
2020-08-05 22:36:00 +03:00
bbb16ff97c
SL-13704 Move link generation into getReleaseNotes()
2020-08-05 20:07:19 +03:00
07c7506b1b
Merge branch 'DRTVWR-476' into DRTVWR-501-maint
2020-08-05 09:59:41 +03:00
8103d13047
SL-13704 Release notes link not loading in ToolsUpdate2 release
2020-07-30 14:43:27 +03:00
64a9ad0f5f
Merge branch 'master' v6.4.6 into DRTVWR-497
2020-07-23 12:21:18 -06:00
f77a30f740
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# autobuild.xml
2020-07-21 11:30:48 +03:00
7bbf3f5f7f
Merge branch 'master' into DRTVWR-501-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
2020-07-20 22:24:10 +03:00
77cf4588df
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
...
following release of D512.
2020-06-23 22:03:43 -04:00
a9471433eb
Merge branch 'master' into DRTVWR-497
2020-06-24 00:10:37 +03:00
adb8d70840
Merge branch 'master' into DRTVWR-507-maint
2020-06-24 00:09:38 +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
05f3287512
Merge branch 'master' into DRTVWR-501-maint
2020-06-23 23:58:52 +03:00
f8137f68a0
Reverted SL-6109 keybinding changes
...
Changes were moved to DRTVWR-514
2020-06-23 16:55:06 +03:00
71b66c758e
SL-13418 Move and view panel now applies changes on the go
2020-06-16 09:52:20 +03:00
d07ef7df92
SL-13418 Added converter from old mouse binding settings to new ones
2020-06-15 18:15:43 +03:00
aaaf3189c4
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
2020-05-19 22:37:41 +03:00
61e979e634
SL-12491 semwait_signal crash
...
Superficially it looks like mac tried to resume ms_sleep after class got destroyed by regular cleanup.
2020-05-18 22:25:52 +03:00
09802fa8ea
Tiny text change in the about box - indicates CEF and Chromium are sub-components
2020-05-15 18:35:28 -07:00
9d5d257cee
DRTVWR-476, SL-12204: Fix crash in Marketplace Listings.
...
The observed crash was due to sharing a stateful global resource (the global
LLMessageSystem instance) between different tasks. Specifically, a coroutine
sets its mMessageReader one way, expecting that value to persist until it's
done with message parsing, but another coroutine sneaks in at a suspension
point and sets it differently.
Introduce LockMessageReader and LockMessageChecker classes, which must be
instantiated by a consumer of the resource. The constructor of each locks a
coroutine-aware mutex, so that for the lifetime of the lock object no other
coroutine can instantiate another.
Refactor the code so that LLMessageSystem::mMessageReader can only be modified
by LockMessageReader, not by direct assignment. mMessageReader is now an
instance of LLMessageReaderPointer, which supports dereferencing and
comparison but not assignment. Only LockMessageReader can change its value.
LockMessageReader addresses the use case in which the specific mMessageReader
value need only persist for the duration of a single method call. Add an
instance in LLMessageHandlerBridge::post().
LockMessageChecker is a subclass of LockMessageReader: both lock the same
mutex. LockMessageChecker addresses the use case in which the specific
mMessageReader value must persist across multiple method calls. Modify the
methods in question to require a LockMessageChecker instance. Provide
LockMessageChecker forwarding methods to facilitate calling the underlying
LLMessageSystem methods via the LockMessageChecker instance.
Add LockMessageChecker instances to LLAppViewer::idleNetwork(), a couple cases
in idle_startup() and LLMessageSystem::establishBidirectionalTrust().
2020-05-14 16:58:33 -04:00
9c445f6edc
Revert SL-8191 due to it no longer being valid
...
This reverts commit 4c006e76e3
2020-05-14 10:56:53 +03:00
ebc629ffc4
Merged in SL-12090 (pull request #105 )
...
SL-12090 Initialize the joystick only when required
* SL-12090 Initialize the joystick only when required
Approved-by: Andrey Kleshchev
2020-05-14 07:51:08 +00: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
663489493e
SL-12970 Fixed char length crash
2020-05-07 21:31:55 +03:00
ca6f092929
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
2020-05-06 16:06:26 -04:00
30234c508b
Merge branch 'master' into DRTVWR-507-maint
2020-05-05 01:40:40 +03:00
3053f62483
SL-12527 cursor is not changed to the pointer on the MoTD link when teleporting
2020-05-05 01:32:38 +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
6bd9fe4233
Merge branch 'master' into DRTVWR-497
2020-05-04 23:36:10 +03:00
691a2d996c
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
2020-05-04 10:53:11 -07:00
77d2a05921
Pick up first version of new Dullahan build autobuild scripts that builds CEF wrapper first before building Dullahan. Change to version headers meant a change to appviewer.cpp too.
2020-05-03 19:03:22 -07:00
Dave Houlton