Ansariel
|
591c75ebaf
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llmath/llvolume.cpp
# indra/llmessage/llcorehttputil.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/darwin/apple-notarize.sh
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/viewer_manifest.py
|
2024-06-10 21:53:31 +02:00 |
|
Ansariel
|
4b52dd754b
|
Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed
|
2024-06-10 19:30:17 +03:00 |
|
Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
1b67dd855c
|
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
|
2024-05-22 19:04:52 +02:00 |
|
Ansariel
|
0ecfbc3de9
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
|
2024-05-16 14:10:55 +02: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
|
9a044f4a52
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llappearance/llavatarappearance.h
# indra/llappearance/lldriverparam.h
# indra/llappearance/llviewervisualparam.cpp
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llcharacter/llcharacter.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/llagent.cpp
# indra/newview/llcallbacklist.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llpanelnearbymedia.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
|
2024-02-13 00:54:24 +01:00 |
|
Lars Næsbye Christensen
|
3a12af88b7
|
llplugin: BOOL (int) to real bool
|
2024-02-12 23:17:22 +02:00 |
|
Ansariel
|
f46a15b3f3
|
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
|
2022-01-11 15:04:11 +01:00 |
|
Mnikolenko Productengine
|
d91606b354
|
Merge branch 'master' into DRTVWR-544-maint
|
2021-12-20 15:36:23 +02:00 |
|
Andrey Kleshchev
|
e55a0510ff
|
SL-16510 VLC time slider sometimes does not work
|
2021-12-14 21:40:10 +02: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
|
0efda8f28d
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-08-18 22:41:20 +02:00 |
|
Tonya Souther
|
46bd337096
|
FIRE-30019: Remove clamp on shared media size on Linux
|
2020-08-14 18:32:11 -05: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
|
77f56fa7bf
|
Merge branch 'DRTVWR-512' of https://bitbucket.org/lindenlab/viewer
|
2020-05-31 15:27:02 +02:00 |
|
Callum Prentice
|
9c78928311
|
Initial port of the changes from DRTVWR509 (Adult Swim) minus the volume fall-off settings updates
|
2020-04-28 10:57:17 -07: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
|
548d688adf
|
Backed out changeset: b4182ee25942
|
2019-09-14 05:14:07 +03:00 |
|
AndreyL ProductEngine
|
ddbe9583ff
|
Backed out changeset: a6398f90389a
|
2019-09-14 05:13:53 +03:00 |
|
AndreyL ProductEngine
|
823cef92ed
|
Merged in lindenlab/viewer-lynx
|
2019-08-13 21:58:10 +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 |
|
maxim_productengine
|
ffae378ab1
|
SOCIAL-231 Show tooltips for links and images im media browser
|
2019-06-11 17:38:04 +03: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 |
|
ruslantproductengine
|
20ca495012
|
SL-10811 - [Render][OSX] Google’s search results page is not fully displayed in the Media Browser if HiDPI is enabled.
SL-10813 - [Render][OSX] HiDPI browser has black bars on the sides.
Fixed.
|
2019-04-24 18:20:34 +03:00 |
|
ruslantproductengine
|
27ebf0dc63
|
SL-10811 - [Render][OSX] Google’s search results page is not fully displayed in the Media Browser if HiDPI is enabled.
SL-10813 - [Render][OSX] HiDPI browser has black bars on the sides.
Fixed.
|
2019-04-24 18:20:34 +03:00 |
|
Ansariel
|
dfaea5c018
|
Merge Firestorm LGPL
|
2018-04-12 21:55:46 +02:00 |
|
AndreyL ProductEngine
|
8c67f588da
|
Merged in lindenlab/viewer-release
|
2018-04-12 21:22:22 +03:00 |
|
Ansariel
|
eaed4497da
|
Merge viewer-media-update
|
2018-02-14 21:56:53 +01:00 |
|
Ansariel
|
70bc436487
|
Merge viewer-neko
|
2018-02-12 22:28:26 +01:00 |
|
Andrey Kleshchev
|
2714ff8f25
|
MAINT-8276 Arrows 'Navigate back' and 'Navigate forward' have wrong state
|
2018-02-12 19:27:09 +00: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
|
6ced87c027
|
Pull in Dullahan 1.1.930 with improved fix for maint-8095 (target='_blank' links) as well as an improvement for maint-8100 (no error message for invalid hostname / url)
|
2017-12-15 16:11:29 -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
|
dbad1e3a5d
|
MAINT-7462 check pointer to avoid allocation crash in llpluginclassmedia
|
2017-06-07 21:19:34 +02:00 |
|
andreykproductengine
|
d3a1c4cda4
|
MAINT-7462 check pointer to avoid allocation crash in llpluginclassmedia
|
2017-06-06 16:06:28 +03: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 |
|
Nicky
|
1bbbc85e46
|
And another merge with https://bitbucket.org/lindenlab/viewer-vlc/
|
2016-10-05 22:34:46 +02:00 |