summaryrefslogtreecommitdiff
path: root/indra/llplugin
AgeCommit message (Collapse)Author
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-08-10SL-3704 Give plugins some time to terminateAndrey Kleshchev
requestExit() doesn't close CEF, command sets CEF into closing state which will be processed on update()
2020-07-21Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llerror.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp
2020-07-21Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2020-07-17SL-13567 Users should have separate CEF contextsAndrey Kleshchev
2020-07-06SL-13497 Sometimes plugin process isn't terminated correctly.Andrey Kleshchev
2020-06-23DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476Nat Goodspeed
following release of D512.
2020-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-04-28Initial port of the changes from DRTVWR509 (Adult Swim) minus the volume ↵Callum Prentice
fall-off settings updates
2020-03-25[DRTVWR-476] - fix linkingAnchor
2020-03-25DRTVWR-494: Use std::thread::id for LLThread::currentID().Nat Goodspeed
LLThread::currentID() used to return a U32, a distinct unsigned value incremented by explicitly constructing LLThread or by calling LLThread:: registerThreadID() early in a thread launched by other means. The latter imposed an unobvious requirement on new code based on std::thread. Using std::thread::id instead delegates to the compiler/library the problem of distinguishing threads launched by any means. Change lots of explicit U32 declarations. Introduce LLThread::id_t typedef to avoid having to run around fixing uses again if we later revisit this decision. LLMutex, which stores an LLThread::id_t, wants a distinguished value meaning NO_THREAD, and had an enum with that name. But as std::thread::id promises that the default-constructed value is distinct from every valid value, NO_THREAD becomes unnecessary and goes away. Because LLMutex now stores LLThread::id_t instead of U32, make llmutex.h #include "llthread.h" instead of the other way around. This makes LLMutex an incomplete type within llthread.h, so move LLThread::lockData() and unlockData() to the .cpp file. Similarly, remove llrefcount.h's #include "llmutex.h" to break circularity; instead forward-declare LLMutex. It turns out that a number of source files assumed that #include "llthread.h" would get the definition for LLMutex. Sprinkle #include "llmutex.h" as needed. In the SAFE_SSL code in llcorehttp/httpcommon.cpp, there's an ssl_thread_id() callback that returns an unsigned long to the SSL library. When LLThread:: currentID() was U32, we could simply return that. But std::thread::id is very deliberately opaque, and can't be reinterpret_cast to unsigned long. Fortunately it can be hashed because std::hash is specialized with that type.
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-10-16Brought back the changes from @andreyk for improved mouse scroll wheel ↵AndreyL ProductEngine
performance (previously 8e228364f324)
2019-10-15Downstream merge from lindenlab/viewer-bearAndreyL ProductEngine
2019-09-14Backed out changeset: 8e228364f324AndreyL ProductEngine
2019-09-14Backed out changeset: b4182ee25942AndreyL ProductEngine
2019-09-14Backed out changeset: a6398f90389aAndreyL ProductEngine
2019-08-13Merge viewer-release 6.2.5Graham Linden
2019-08-13Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-08-13Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2019-07-01SL-3704 Plugin exit issuesandreykproductengine
2019-06-11Pull in CEF 75.0.1+gb5e74dd+chromium-75.0.3770.80 and Dullahan 1.2.x along ↵callum_linden
with some minor compatibility changes
2019-06-11SOCIAL-231 Show tooltips for links and images im media browsermaxim_productengine
2019-06-10Changes from @andreyk for improved mouse scroll wheel performance and pull ↵callum_linden
in new Dullahan with CEF 74.1.19_gb62bacf_chromium-74.0.3729.157
2019-05-08Merge viewer-releaseGraham Linden
2019-05-08Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-04-24SL-10811 - [Render][OSX] Google’s search results page is not fully ↵ruslantproductengine
displayed in the Media Browser if HiDPI is enabled. SL-10813 - [Render][OSX] HiDPI browser has black bars on the sides. Fixed.
2019-03-01Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-01-14SL-10291 Replace apr_mutex with standard C++11 functionalityandreykproductengine
2019-02-28MergeRider Linden
2018-09-07remove only-partially-successful attempt to put teamcity blocks around targetsOz Linden
2018-09-05add more block structure to TeamCity log output for componentsOz Linden
2018-06-21MergeRider Linden
2018-05-22MergeRider Linden
2018-04-17MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not ↵andreykproductengine
choose the save directory files within the first minute
2018-04-13MergeRider Linden
2018-04-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-02-28MergeGraham Linden graham@lindenlab.com
2018-02-18Atmospherics WIPGraham Linden graham@lindenlab.com
libatmosphere integrated in indra/llrender/llatmosphere.cpp Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
2018-02-14Automated merge with tip of viewer-releasecallum_linden
2018-02-12MAINT-8276 Arrows 'Navigate back' and 'Navigate forward' have wrong stateAndrey Kleshchev
2018-01-26Fixes for: MAINT-8244 Text in CEF cannot be selected with the mouse. ↵callum_linden
MAINT-8245 Expose CEF log file and logging severity to viewer and MAINT-8246 Expose the CEF remote debugging system to the viewer
2018-01-17Fixes for 'MAINT-8196 Remove LLPluginCookieStore from the viewer' and ↵callum_linden
'MAINT-8194 Remove per-frame calls to updateJavascriptObject()'
2018-01-17merge 5.1.0-releaseOz Linden
2017-12-15Pull in Dullahan 1.1.930 with improved fix for maint-8095 (target='_blank' ↵callum_linden
links) as well as an improvement for maint-8100 (no error message for invalid hostname / url)
2017-12-14Pull in Dullahan 1.1.929 (multiple file picking support) and update plugin ↵callum_linden
code accordingly
2017-09-27MAINT-7081: Mention nghttp2 library wherever it must be mentioned.Nat Goodspeed
2017-08-23merge changes for 5.0.7-releaseOz Linden
2017-08-16merge changes for DRTVWR-439Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 10:33:20 +0000