summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2020-06-03Post-merge buildfixAndrey Lihatskiy
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-06-02Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512Callum Prentice
2020-06-02DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.Nat Goodspeed
2020-06-02Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-06-02Increment viewer version to 6.4.4Nat Goodspeed
following promotion of DRTVWR-508
2020-05-28SL-13329 Misalligned checkboxes in inventory filtersAndrey Kleshchev
2020-05-28SL-12607 Bar color to blueAndrey Kleshchev
2020-05-28SL-13340 Restored status display for loginAndrey Kleshchev
2020-05-28SL-12665 Readjusted all logosAndrey Kleshchev
2020-05-28SL-12664 readjusted logo #2Andrey Kleshchev
2020-05-28SL-12664 readjusted logoAndrey Kleshchev
2020-05-28SL-12607 Reverted to original logosAndrey Kleshchev
2020-05-27SL-13329 Misalligned checkboxes in inventory filtersAndrey Kleshchev
2020-05-27DRTVWR-476, VOICE-88, SL-13025: Use a new port every SLVoice launch.Nat Goodspeed
The observed failure is that SLVoice, on relaunch, produces an error that bind() returned EADDRINUSE and terminates. Using a different port every time we relaunch avoids that collision.
2020-05-27DRTVWR-476: Make LLVivoxVoiceClient::logoutOfVivox() wait for logout.Nat Goodspeed
It can happen that we arrive at logoutOfVivox() with some other message queued on the LLEventMailDrop in question. If logoutOfVivox() assumes that other message is logout and exits, then subsequent code gets confused. Introduce a loop to wait (with the existing timeout) for the real logout message.
2020-05-27SL-13148 Implemented wheel support for inworld mediaAndrey Kleshchev
2020-05-22Fix (has a TOOD) for SL-13203: Parcel media auto-play works when turned offCallum Prentice
2020-05-21Investigating a fix/abatement for SL-13095 Windows Defender Firewall for ↵Callum Prentice
dullahan_host.exe pops up late in the session - not clear this will remove the popup but it might and it will hopefully have our publisher info on it vs 'Unknown'
2020-05-20Fix for SL-13125 Update MediaRollOff values for greater range and less ↵Callum Prentice
attenuation
2020-05-20Merge branch 'master' into DRTVWR-512Callum Prentice
2020-05-20Remove more traces of find_library to search for DirectX and insteadNicky Dasmijn
rely on the SDK setup. Remove old dinput8 import library as it is not needed
2020-05-20Remove DirectX.cmake. With recent SDKs (dating back to at least VS 2013Nicky Dasmijn
and the 8.1 SDK) DirectX is included in the SDK and does not need any special detection logic.
2020-05-19Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
2020-05-19SL-13273 Updated the SL logo imagesAndrey Lihatskiy
2020-05-19SL-12896 BOM texture settings - replaced isRiggedMesh() call with faster checkAndrey Lihatskiy
2020-05-19SL-12904 Restored the missing code (post-merge)Andrey Lihatskiy
2020-05-18Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp
2020-05-18DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-18Merged master into DRTVWR-508Andrey Kleshchev
2020-05-18Increment viewer version to 6.4.3Nat Goodspeed
following promotion of DRTVWR-460
2020-05-15Tiny text change in the about box - indicates CEF and Chromium are ↵Callum Prentice
sub-components
2020-05-15SL-12237 Remade updates for invisible avatarsAndrey Kleshchev
2020-05-14DRTVWR-476, SL-12204: Fix crash in Marketplace Listings.Nat Goodspeed
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-14Merged in SL-12090 (pull request #105)Andrey Lihatskiy
SL-12090 Initialize the joystick only when required * SL-12090 Initialize the joystick only when required Approved-by: Andrey Kleshchev
2020-05-07SL-12970 Fixed char length crashAndrey Kleshchev
2020-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-06DRTVWR-510 cache vulkan-detect resultDave Houlton
2020-05-06DRTVWR-510 add code to report Vulkan capability in stats (Windows-only)Dave Houlton
2020-05-05SL-13178 Improve initial opening time of the landmarks floaterMnikolenko Productengine
2020-05-05SL-12527 cursor is not changed to the pointer on the MoTD link when teleportingAndrey Kleshchev
2020-05-05BuildfixAndrey Lihatskiy
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# 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-04Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-05-04Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512Callum Prentice
2020-05-04Merged master into DRTVWR-508Andrey Kleshchev
2020-05-04Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-05-04Increment viewer version to 6.4.2Nat Goodspeed
following promotion of DRTVWR-500
2020-05-03Pick up first version of new Dullahan build autobuild scripts that builds ↵Callum Prentice
CEF wrapper first before building Dullahan. Change to version headers meant a change to appviewer.cpp too.
2020-05-01SL-12678 Removed auto login retryAndrey Kleshchev