Ansariel
|
b99cf9fb86
|
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
|
2025-09-05 14:55:37 +02:00 |
|
Rye
|
536c821c09
|
MacOS companion changes for dullahan 1.21 including package structure and linkage fixes
|
2025-08-27 23:05:40 -04:00 |
|
Rye
|
e629bf05d6
|
Changes to support dullahan 1.21 undo/redo/delete/select all edit handlers
|
2025-08-27 22:36:55 -04:00 |
|
Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +02:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
Ansariel
|
45dc1a63f0
|
Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llprimitive/lldaeloader.cpp
# indra/llui/lllayoutstack.cpp
# indra/llui/llnotifications.h
# indra/llui/lltoolbar.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llfloaterimnearbychathandler.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llsidepanelappearance.h
# indra/newview/lltoolbarview.cpp
|
2024-01-12 14:18:34 +01:00 |
|
AiraYumi
|
7c8907522f
|
replace boost library to standard
|
2024-01-08 23:29:21 +02:00 |
|
Ansariel
|
ae2a0b24b8
|
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
|
2022-05-05 10:00:17 +02:00 |
|
Mnikolenko Productengine
|
fb4aab3144
|
SL-17246 Fix getSharedPrt typo
|
2022-04-20 00:51:13 +03:00 |
|
Ansariel
|
ced9423261
|
Merge branch 'DRTVWR-534' of https://bitbucket.org/lindenlab/viewer
|
2021-11-16 12:17:26 +01:00 |
|
Andrey Lihatskiy
|
0505c6ebbb
|
Merge branch 'master' into DRTVWR-534
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
2021-11-16 01:21:55 +02:00 |
|
Ansariel
|
f843a97aeb
|
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-09-20 11:26:51 +02:00 |
|
Callum Linden
|
b12dd38c57
|
SL-15867 User not logged in - very much the MVS (minimum viable solution) but by storing the OpenID cookie when it arrives then injecting it forcefully into each new media instance, it appears that the 'not logged in' problem is solved - at least in my testing, 20+ times logging in without a cache and profiles, dashboard etc. were all logged in - QA will confirm. The full solution involves providing a separate cache for each media instance and tightening up the CEF cookie calling code - that is a large project and this is sufficient for now
|
2021-09-01 22:26:21 +03:00 |
|
Callum Prentice
|
0c89e67eb5
|
DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one.
|
2021-08-20 08:28:48 -07:00 |
|
Ansariel
|
e5677c891a
|
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-07-24 20:15:15 +02:00 |
|
Andrey Kleshchev
|
383352c61c
|
SL-13567 Users should have separate CEF contexts
|
2020-07-17 19:00:58 +03:00 |
|
Ansariel
|
3789a192dc
|
Merge viewer-lynx
|
2019-10-16 22:48:57 +02:00 |
|
AndreyL ProductEngine
|
0ff935ca3c
|
Brought back the changes from @andreyk for improved mouse scroll wheel performance (previously 8e228364f324)
|
2019-10-16 01:37:15 +03:00 |
|
Ansariel
|
d59cd13de1
|
Merge viewer-bear
|
2019-10-09 22:43:10 +02:00 |
|
AndreyL ProductEngine
|
2f7b606202
|
Backed out changeset: 8e228364f324
|
2019-09-14 05:14:24 +03:00 |
|
AndreyL ProductEngine
|
ddbe9583ff
|
Backed out changeset: a6398f90389a
|
2019-09-14 05:13:53 +03:00 |
|
Ansariel
|
e2620e973f
|
Merge viewer-neko
|
2019-06-20 09:50:07 +02:00 |
|
callum_linden
|
d278699b7b
|
Pull in CEF 75.0.1+gb5e74dd+chromium-75.0.3770.80 and Dullahan 1.2.x along with some minor compatibility changes
|
2019-06-11 20:28:54 -07:00 |
|
callum_linden
|
7bce446b28
|
Changes from @andreyk for improved mouse scroll wheel performance and pull in new Dullahan with CEF 74.1.19_gb62bacf_chromium-74.0.3729.157
|
2019-06-10 14:09:31 -07:00 |
|
Ansariel
|
e97c25531c
|
Merge viewer-neko
|
2018-05-25 22:05:19 +02:00 |
|
andreykproductengine
|
5219e6c455
|
MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute
|
2018-04-17 19:25:28 +03:00 |
|
Ansariel
|
eaed4497da
|
Merge viewer-media-update
|
2018-02-14 21:56:53 +01:00 |
|
callum_linden
|
8b09a997c5
|
Fixes for: MAINT-8244 Text in CEF cannot be selected with the mouse. 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-26 17:06:19 -08:00 |
|
callum_linden
|
d3f544d39d
|
Fixes for 'MAINT-8196 Remove LLPluginCookieStore from the viewer' and 'MAINT-8194 Remove per-frame calls to updateJavascriptObject()'
|
2018-01-17 16:13:19 -08:00 |
|
callum_linden
|
6166ab28dd
|
Pull in Dullahan 1.1.929 (multiple file picking support) and update plugin code accordingly
|
2017-12-14 14:27:49 -08:00 |
|
Ansariel
|
0d0d9c4e23
|
Merge viewer-bear
|
2016-11-04 14:02:34 +01:00 |
|
pavelkproductengine
|
07e78807a8
|
MAINT-6810 win10, 4k monitor and UI scale of 2.0 makes most web content too small to read
|
2016-10-27 19:48:59 +03:00 |
|
Ansariel
|
3192fe832f
|
Merge viewer-quickgraphics
|
2016-03-08 01:41:31 +01:00 |
|
Oz Linden
|
bc22e58743
|
merge changes for 4.0.1-release
|
2016-01-15 16:55:04 -05:00 |
|
Nicky
|
6d918a0fb5
|
Merge.
|
2015-12-17 05:46:23 +01:00 |
|
callum_linden
|
3bf8929d93
|
MAINT-5966 - file download failures need feedback
|
2015-12-15 15:24:41 -08:00 |
|
Nicky
|
3f1a78cee9
|
Merge with CEF tip.
|
2015-11-24 15:28:05 +01:00 |
|
Nicky
|
ee10a7bae0
|
Remove CEFFlash settings. In newer llceflib versions LL decided to handle this via the plugins setting.
|
2015-11-24 15:04:47 +01:00 |
|
callum_linden
|
311b376ab5
|
Update SetCookie code for new LLCEFLib API and add support for shoing/hising developer console (Inspector)
|
2015-11-16 16:09:40 -08:00 |
|
Rider Linden
|
059925eafb
|
Added code to initiate controlled shutdown of plugins with timeouts for misbeahving plugin.
|
2015-11-10 13:45:30 -08:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Nicky
|
8e4ab13c4a
|
Merge.
|
2015-10-25 19:09:16 +01:00 |
|
Nicky
|
e97f886dcc
|
Merge.
|
2015-10-25 17:46:36 +01:00 |
|
callum_linden
|
16cd296e30
|
MAINT-5775 FIX Split out cookies and cache directories into separate folders and move cache to same place as viewer cache
|
2015-10-22 13:24:43 -07:00 |
|
callum_linden
|
6599e10d00
|
Merge with tip of viewer-release
|
2015-10-20 16:39:00 -07:00 |
|
callum_linden
|
2a899b49dd
|
MAINT-5711 FIX profiles and marketplace are asking for a login each session
|
2015-10-19 18:43:48 -07:00 |
|
Nicky
|
5c34ff4224
|
Merge.
|
2015-10-13 17:00:24 +02:00 |
|
Nicky
|
a10e66a515
|
Implement debug setting for a) Set the CEF plugin flip the generated media texture (more CPU and RAM intensive, default off) and b) try use an installed pepper flash (default off, get a PPAPI installer from https://get.adobe.com/flashplayer/otherversions/). This triggers http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=13094
|
2015-09-15 20:27:04 +02:00 |
|
Ansariel
|
5fe09cb64d
|
Merge Viewer-Bear
|
2015-08-22 03:13:17 +02:00 |
|
andreykproductengine
|
1d3c59f29c
|
MAINT-5398 FIXED [BetaBreakers] TOS additional policy links cannot be scrolled or closed once opened
|
2015-07-23 19:15:07 +03:00 |