livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79,697 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

3442 Commits (9c9f555ae3169ef97ef0155b579cf8a15c4f1040)

Author SHA1 Message Date
Ansariel 7a2070d795 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llscrollingpanelparam.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llvovolume.cpp
 2024-04-24 18:59:46 +02:00
Brad Linden 86c0c1d553 Merge remote-tracking branch 'origin/main' into release/materials_featurette 2024-04-24 09:55:34 -07:00
Andrey Lihatskiy 85f2447b3d Merge branch 'main' into marchcat/a-merge 
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llvovolume.cpp
 2024-04-24 19:28:15 +03:00
Andrey Lihatskiy 428f21cf79 Merge branch 'main' into marchcat/x-merge 2024-04-24 18:45:54 +03:00
Rye Mutt e361671018
Port from OpenEXR to TinyEXR for reduced installer and library size (#1287) 2024-04-19 14:39:28 -05:00
RunitaiLinden 3ebf8761bc Update autobuild.xml 2024-04-19 11:17:33 -05:00
Roxie Linden f5c5c5ec94 Issue in WebRTC was disabling custom audio processing (level detection) 
There is a case where the custom audio processor, which is used to
determine audio levels, was disabled on connection shutdown even
when another connection was established.

This issue has been patched in the webrtc library.
 2024-04-16 23:11:44 -07:00
Andrey Lihatskiy 355f231f0c
Merge pull request #1224 from nerodevo/autobuild-revert 
Revert removal of llphysicsextension_stub for Windows
 2024-04-16 21:58:36 +03:00
nerodevo d06e000435
Change windows to windows64 again 
Missed the second change... Here it is.
 2024-04-16 11:08:23 -05:00
nerodevo b04b4de465
Change windows to windows64 2024-04-16 10:52:24 -05:00
Ansariel 89b5410d0c Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llprofilercategories.h
#	indra/llwebrtc/llwebrtc.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llimview.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
 2024-04-16 12:53:16 +02:00
Ansariel 0cf61eed93 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/newview/llvoicevivox.cpp
 2024-04-16 11:41:43 +02:00
nerodevo ae79615794 Revert "DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub." 
This reverts commit d07cd115e3.
 2024-04-13 06:31:38 -05:00
Ansariel 7355b798d2 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimageworker.cpp
#	indra/llimage/llimageworker.h
#	indra/newview/llcontrolavatar.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/lltexturefetch.cpp
 2024-04-12 19:33:20 +02:00
Andrey Lihatskiy eab5beb54c Merge branch 'main' into marchcat/x-merge 
# Conflicts:
#	indra/llimage/llimageworker.cpp
#	indra/llimage/llimageworker.h
#	indra/newview/llcontrolavatar.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/lltexturefetch.cpp
 2024-04-12 15:43:34 +03:00
Ansariel 4a5b1c1bc5 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/JsonCpp.cmake
#	indra/cmake/LLAddBuildTest.cmake
#	indra/llcommon/lluuid.cpp
#	indra/llcorehttp/CMakeLists.txt
#	indra/llmessage/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/llscripteditor.h
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llvoavatar.cpp
#	indra/test/CMakeLists.txt
#	indra/test/test.cpp
 2024-04-12 03:28:00 +02:00
Ansariel d0102af56d Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 
# Conflicts:
#	indra/llcommon/llapp.cpp
#	indra/llcommon/llapp.h
#	indra/llimage/llimageworker.cpp
#	indra/llui/llcontainerview.cpp
#	indra/llui/llcontainerview.h
#	indra/llui/llkeywords.cpp
#	indra/llui/lltabcontainer.cpp
#	indra/llui/lltextbase.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfavoritesbar.h
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llhudnametag.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelvoicedevicesettings.h
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltranslate.cpp
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewermessage.cpp
 2024-04-11 21:59:38 +02:00
Ansariel 2474e3ba1d Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
 2024-04-10 10:03:37 +02:00
Ansariel 096aef2a72 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-10 01:49:35 +02:00
Brad Linden 5a47a3cb23 Merge remote-tracking branch 'origin/main' into release/materials_featurette 2024-04-09 14:17:34 -07:00
Ansariel bc2b88be93 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-09 19:46:31 +02:00
Pork Chop 06c8475d74 Linux: Remove obsolete gstreamer 0.10 3p package (superseded by existing gstreamer 1.x package), replace 3p dependency for icu4c and fltk with LL provided versions. 2024-04-06 06:01:37 +00:00
Rye Mutt 17e1f3692c
Port from JsonCPP to Boost.Json for json parsing and serializing (#1054) 2024-04-06 02:03:58 +03:00
Ansariel 22d4c8b94d Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-02 19:35:40 +02:00
Pork Chop 26bdff6572 Linux: Update 3p library packages for SDL2, freetype and open_libndofdev 2024-04-01 09:48:54 +00:00
Bennett Goble d9f7cd36a7 Switch to 3p-boost repo built libs 2024-04-01 10:28:17 +03:00
Bennett Goble cf45bf5f6e Add boost 1.84.0, boost.json 
Update boost from 1.81.0 (2022) to 1.84.0 (2023) and enable the
`boost.json` module so that it can replace rapidjson.
 2024-04-01 10:28:17 +03:00
Rye Mutt 53d4fcd359 Remove dead googlemock dependency and related setup code 2024-03-28 19:41:47 +02:00
Pork Chop 8693cf763a Linux: Consume LL provided 3p library dependencies since numerous linux64 builds for them are now available on github, remove unused bundled dependencies (SDL1 and FC) 2024-03-28 14:39:39 +00:00
Ansariel 77b6a6e978 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-27 15:32:45 +01:00
Ansariel 32c24ffbd7 Fix merge issues 2024-03-27 15:48:33 +02:00
Ansariel 07b99632f3 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llerror.cpp
#	indra/llimage/llimagebmp.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llrender/llrender.cpp
#	indra/llui/lltransutil.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloaterenvironmentadjust.cpp
#	indra/newview/llpaneleditwater.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/skins/default/xui/de/menu_viewer.xml
#	indra/newview/skins/default/xui/de/strings.xml
#	indra/newview/skins/default/xui/en/strings.xml
 2024-03-27 12:48:58 +01:00
Ansariel cbf6aca2e8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	.github/workflows/build.yaml
 2024-03-27 10:35:43 +01:00
Andrey Lihatskiy 990c8b81da Merge branch 'main' into marchcat/yz-merge 2024-03-27 01:40:12 +02:00
Andrey Lihatskiy 71ed19839e Merge branch 'main' into DRTVWR-600-maint-A 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterchangeitemthumbnail.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llvovolume.cpp
 2024-03-27 00:45:06 +02:00
Andrey Lihatskiy 1ae6f5dd6f Merge branch 'main' into DRTVWR-591-maint-X 
# Conflicts:
#	indra/llui/lltransutil.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloaterenvironmentadjust.cpp
#	indra/newview/llpaneleditwater.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
 2024-03-27 00:33:40 +02:00
Andrey Lihatskiy 78174fc865 Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W 
# Conflicts:
#	.github/workflows/build.yaml
 2024-03-27 00:14:56 +02:00
Ansariel c111665779 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-26 22:29:40 +01:00
Ansariel a8446ac624 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-24 21:52:26 +01:00
Pork Chop 81da03f8c7 Fix linux build 2024-03-24 16:56:54 +11:00
Ansariel 051c9bafc8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-23 12:40:26 +01:00
Roxie Linden 0e2fc4d35e Clear out observers when terminating a connection 2024-03-19 17:05:56 -07:00
Ansariel 39c32ae9ca Revert "use the github release asset path for autobuild webrtc" 
This reverts commit 3794e3275c.
 2024-03-19 17:10:36 +01:00
Ansariel 5e75273b49 Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/llagent.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvoicevivox.h
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1
 2024-03-19 17:09:42 +01:00
Roxie Linden 3794e3275c use the github release asset path for autobuild webrtc 2024-03-18 17:32:51 -07:00
Roxie Linden 2f40b1fcef update to use public github-based release of autobuild webrtc 2024-03-18 17:13:36 -07:00
Pork Chop 159b94d8ea Linux: dullahan + cef - same version, replace with zstd compressed package instead. 2024-03-18 19:58:23 +11:00
Ansariel b1a271c3aa Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/ICU4C.cmake
#	indra/llui/lltextbase.h
#	indra/llui/llview.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
 2024-03-17 17:53:34 +01:00
Ansariel 159ef68fa7 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltexteditor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llfloateremojipicker.cpp
 2024-03-17 16:41:38 +01:00
Ansariel efe7cdf153 Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/skins/default/xui/de/panel_region_terrain.xml
#	indra/newview/skins/default/xui/es/panel_region_terrain.xml
#	indra/newview/skins/default/xui/fr/panel_region_terrain.xml
#	indra/newview/skins/default/xui/it/panel_region_terrain.xml
#	indra/newview/skins/default/xui/ja/panel_region_terrain.xml
#	indra/newview/skins/default/xui/pt/panel_region_terrain.xml
#	indra/newview/skins/default/xui/ru/panel_region_terrain.xml
#	indra/newview/skins/default/xui/tr/panel_region_terrain.xml
#	indra/newview/viewer_manifest.py
 2024-03-15 22:52:24 +01:00
Ansariel 60f4614a2b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-15 21:08:35 +01:00
Roxie Linden 0e7b5f5270 Update paths for webrtc-shim 2024-03-15 12:24:37 -07:00
Henri Beauchamp 2f452d06e6 Proposal #2 to restore how UI/dialogs used to render by prioritizing fallback fonts. 
With the emojis support, a new font was added, which not only provides emojis
but also fancy colorful replacements for UTF-8 characters that used to be
supported by our fallback (monochrome) fonts: this causes discrepancies and
unwanted/undesired changes in scripted objects menus (e.g. an empty circle or
square may render as a black, full one, a heart may render red instead of white),
not to mention the larger font size used by the emoji characters...

This patch restores the aspect of such menus/dialogs/UI elements with UTF-8
characters that *are* supported by the usual fallback fonts (fonts which may
also vary from one viewer to another, and from one OS to another), so that
everything keeps working/rendering as it always did so far, while not impairing
the use of new colorful emojis.

This second proposal ensures that:
- "genuine" emojis (in the 0x1f000-0x1ffff range), will *always* be rendered
  using the new emojis font (this solves, for example, the monochrome "yellow
  faces" issue seen with some characters in my first proposal).
- Special UTF-8 characters (in the 0x2000-0x32FF range) which have been used by
  scripters so far, will render as they used to, using the monochrome fallback
  fonts (this repairs scripted dialogs menus).
- Remaining special characters, that do not have a corresponding glyph in the
  monochrome font, but do have one in the emojis font, will use the latter font
  to render.

It also got the nice side-effect of removing the dependency on the ICU4C library.

Note however that the recent commit:
326055ba82
will need to be reverted to allow this patch to actually fix scripted dialogs.

Also, some cleanup might be needed in skins/default/xui/*/emoji_characters.xml to
remove from it the special UTF-8 characters that will no longer be rendered with
fanciful colors, but instead with the monochrome font glyphs.
 2024-03-14 01:47:14 +02:00
RunitaiLinden 4c3d090bf4 #926 Unshuffle autobuild.xml 2024-03-13 14:47:31 -05:00
RunitaiLinden 5c605a60f5 Revert "secondlife/viewer#926 further work on mac openexr lib." 
This reverts commit ce6170802d.
 2024-03-13 14:42:22 -05:00
Brad Linden ce6170802d secondlife/viewer#926 further work on mac openexr lib. 
switching mac lib to be statically linked

autobuild installables edit openexr platform=darwin64 url=https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-darwin64-df7544d.tar.zst hash_algorithm=sha1 hash=17cd63922214b588d9a36137fadf927237ec0f25
autobuild installables edit openexr platform=linux64 url=https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-linux64-df7544d.tar.zst hash_algorithm=sha1 hash=b092658ab5ec009a5875e8b6e5b7109730ad6846
autobuild installables edit openexr platform=windows64 url=https://github.com/secondlife/3p-openexr/releases/download/v1.10/openexr-3.2.2-windows64-df7544d.tar.zst hash_algorithm=sha1 hash=c511ae9a3e401375af2199b498a75f32cebc010f
 2024-03-12 16:46:48 -07:00
Ansariel eb1ed3896f Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A 
# Conflicts:
#	autobuild.xml
#	indra/llrender/llfontbitmapcache.cpp
#	indra/llrender/llfontbitmapcache.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llui/llbutton.h
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/llscrollcontainer.cpp
#	indra/llui/llscrollingpanellist.cpp
#	indra/llui/llscrollingpanellist.h
#	indra/llui/llscrolllistctrl.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llui/lluictrl.cpp
#	indra/llui/llview.cpp
#	indra/llui/llview.h
#	indra/newview/llchicletbar.h
#	indra/newview/llconversationlog.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterimsessiontab.h
#	indra/newview/llfloateruipreview.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llpaneltopinfobar.h
#	indra/newview/llpathfindingpathtool.h
#	indra/newview/lltextureview.cpp
#	indra/newview/lltoolbrush.h
#	indra/newview/lltoolcomp.h
#	indra/newview/lltooldraganddrop.h
#	indra/newview/lltoolface.h
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolindividual.h
#	indra/newview/lltoolobjpicker.h
#	indra/newview/lltoolpie.h
#	indra/newview/lltoolpipette.h
#	indra/newview/lltoolselectland.h
#	indra/newview/llviewermediafocus.h
#	indra/newview/llviewerparcelmediaautoplay.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoicevivox.h
#	indra/newview/llworldmapview.cpp
 2024-03-12 16:52:30 +01:00
Roxie Linden d67a3022d3 Merge branch 'main' of github.com:secondlife/viewer-private into roxie/webrtc-voice 2024-03-10 15:36:58 -07:00
Ansariel 9d0b91fed7 Undo the reordering of autobuild.xml 2024-03-10 15:53:10 +01:00
Pork Chop 470c607b05 Linux: Update the bundled libfreetype with one that has the bz2 dependency dropped from it - it shouldnbt be needed anyway in most cases 2024-03-10 18:06:44 +11:00
Beq dcde02f97f Fix the autobuild.xml ready for upload of new package 2024-03-10 03:18:27 +00:00
Roxie Linden 994039c948 Use webrtc autobuild package 2024-03-08 22:49:05 -08:00
Beq 1d6d5c3c52 Use our modified font package that has B&W emoji font. 2024-03-09 00:23:18 +00:00
Ansariel 2c64715842 Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llimage/llimagebmp.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llrender/llrender.cpp
#	indra/llui/lltransutil.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfilepicker.h
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/viewer_manifest.py
 2024-03-08 20:35:53 +01:00
Ansariel dec97544fc Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-08 19:12:09 +01:00
RunitaiLinden c1bde75768
HDRI Local Preview (#953) 
* #926 WIP - HDRI import prototype v0

* #926 WIP -- add OpenEXR to autobuild.xml

* #926 WIP -- Add OpenEXR cmake

* #926 WIP -- Attempt at using OpenEXR autobuild package and don't hard code .exr file to load

* #926 Unmangle autobuild.xml and get dll's in the right place (thanks, Caladbolg!)

* implement mac shared libs plumbing for OpenEXR for secondlife/viewer#926

* Fix Xcode/clang compile error regarding new[]/delete[] mismatch

* #926 HDRI Preview finishing touches.

- Full ACES when HDRI is enabled
- Fix for probes getting stuck paused
- Add exposure and rotation controls

---------

Co-authored-by: Brad Linden <brad@lindenlab.com>
 2024-03-08 12:01:20 -06:00
Andrey Kleshchev be35287184 SL-20429 Fix emoji categories having mixed translations 
Was caused by package substituting '&' with 'and' instead of '&amp;'
 2024-03-06 12:42:57 +02:00
Ansariel ac898495ae Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llstring.cpp
#	indra/llcommon/llstring.h
 2024-03-04 22:38:34 +01:00
Andrey Lihatskiy b68a05e7c3 Merge branch 'main' into marchcat/x-merge 
# Conflicts:
#	indra/llcommon/llstring.cpp
#	indra/llcommon/llstring.h
 2024-03-04 18:01:05 +02:00
Pork Chop 7f038e68e7 Linux: Fix build after recent merge 2024-03-03 00:10:32 +11:00
Ansariel 799c2c6dab Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/newview/llinventorygallery.cpp
#	indra/newview/skins/default/xui/de/menu_viewer.xml
 2024-03-02 00:42:18 +01:00
Ansariel 2827ebf04f Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-01 22:47:21 +01:00
Ansariel 203ac04bf6 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2024-03-01 20:49:42 +01:00
Brad Linden 258c039584 Merge remote-tracking branch 'origin/main' into release/gltf-maint2 2024-03-01 10:12:00 -08:00
Andrey Lihatskiy faf69f407f Merge branch 'main' into marchcat/yz-merge 
# Conflicts:
#	indra/newview/llinventorygallery.cpp
 2024-03-01 18:02:48 +02:00
Andrey Lihatskiy 6d077c90a0 Merge branch 'main' into DRTVWR-588-maint-W 2024-03-01 17:30:06 +02:00
Ansariel 474cbf62cf Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-02-14 18:04:46 +01:00
Ansariel bc6a69ac66 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-02-11 18:37:21 +01:00
Andrey Kleshchev 762855f255 SL-19585 Try replacing fmod with openal 
Since now VLC is responsible for played parcel media (should be since
SL-19042) should be possible to switch remaining audio to OpenAL with
no loss of functionality
 2024-02-09 01:31:50 +02:00
Beq 6248b77457 Update FMOD Studio 2.02.20 for Linux and MacOS 2024-02-08 16:21:41 +00:00
Ansariel bce7069a32 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-02-08 15:01:40 +01:00
Ansariel 4ce6b5114d Update FMOD Studio to 2.02.20 for Windows 2024-02-07 18:10:16 +01:00
Ansariel c6356da181 Merge branch 'release/maint-yz' of https://github.com/secondlife/viewer 
# Conflicts:
#	README.md
#	autobuild.xml
#	indra/newview/llchiclet.h
 2024-02-05 23:45:27 +01:00
Ansariel 80579b7574 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-599 
# Conflicts:
#	indra/newview/llchiclet.h
 2024-02-05 23:32:19 +01:00
Andrey Lihatskiy ea916ad950 DRTVWR-594 Update llca to version 202402012004.0 2024-02-02 00:23:36 +02:00
Andrey Kleshchev 39aefc63d1 Issue #716 Update Fmod Studio to version 2.02.20 2024-02-01 21:56:26 +02:00
Ansariel 11207d7985 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 2024-01-26 13:19:06 +01:00
Ansariel fa05f94eae Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/app_settings/settings.xml
 2024-01-23 12:23:54 +01:00
Nat Goodspeed 0752cc0792 DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libs 2024-01-19 11:38:02 -05:00
Ansariel c7a44ac88b Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/lltexturectrl.h
 2024-01-17 11:04:36 +01:00
Ansariel Hiller 0fa6ff2b1f
Undo re-ordering of autobuild.xml (#638) 2024-01-16 11:08:39 -06:00
Ansariel b592795c0b Updated Havok lib with the presumed navmesh fix 2024-01-12 18:15:04 +01:00
RunitaiLinden fab4cfbab2 SL-20704 Fix for pathfinding debug display not working. 2024-01-10 13:50:15 -06:00
Ansariel 709aaaf0b0 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
 2024-01-09 11:58:47 +01:00
Ansariel b9a2c8279f Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
 2024-01-09 10:54:50 +01:00
Ansariel 6208041d15 Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 2024-01-09 10:21:36 +01:00
Ansariel 3bd76c0fea Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llfasttimerview.cpp
#	indra/newview/skins/default/xui/en/widgets/color_swatch.xml
#	indra/newview/skins/default/xui/en/widgets/texture_picker.xml
 2024-01-09 09:37:38 +01:00
Andrey Kleshchev 6e6df8c31e SL-20747 Fix pshell command failing in some cases 2024-01-08 19:27:58 +02:00
Ansariel a8f43fd40b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-01-05 13:17:23 +01:00
Ansariel 0e154e344e It's 2024... basically... almost... 2023-12-31 14:06:25 +01:00
Ansariel e341621a8e Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llmemory.cpp
#	indra/llui/lltooltip.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llpanelteleporthistory.cpp
#	indra/newview/skins/default/xui/en/menu_inventory.xml
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-12-27 13:00:20 +01:00
Nat Goodspeed bc3076938e DRTVWR-601: Update xxhash common platform to GHA build. 
Remove identical platform-specific package references.
 2023-12-20 12:50:34 -05:00
Nat Goodspeed 6f4dcd58b7 DRTVWR-601: Update mikktspace, tinygltf, tracy, vulkan_gltf, xxhash 
to latest GitHub builds. Some of these were still referencing codeticket
builds produced by TeamCity.
 2023-12-18 14:47:03 -05:00
Ansariel 0b556ef3b9 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	.github/release.yaml
#	autobuild.xml
#	indra/newview/llviewermenu.cpp
 2023-12-18 20:45:20 +01:00
Ansariel b32cd27b4c Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	autobuild.xml
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/llmath/llvolume.cpp
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
#	indra/newview/llviewermenu.cpp
 2023-12-18 19:25:49 +01:00
Andrey Lihatskiy aed6313d7c Merge branch 'main' into DRTVWR-594-maint-Y 2023-12-18 06:33:57 +02:00
Ansariel 783e488a63 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	indra/newview/llfloaterimcontainer.cpp
#	indra/newview/llspatialpartition.cpp
 2023-12-15 22:48:56 +01:00
Nat Goodspeed 67da0c7f60 DRTVWR-601: Update vulkan_gltf to GHA build. 2023-12-15 16:23:49 -05:00
Nat Goodspeed d07cd115e3 DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub. 2023-12-15 16:14:38 -05:00
Nat Goodspeed 1df31d64e8 DRTVWR-601: Update mikktspace and tinygltf to GHA package builds. 
Ditch 32-bit Windows build of mikktspace.
 2023-12-15 16:13:51 -05:00
Ansariel e3c2f12d53 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	indra/newview/skins/default/xui/da/panel_main_inventory.xml
#	indra/newview/skins/default/xui/pt/panel_main_inventory.xml
#	indra/newview/skins/default/xui/tr/panel_main_inventory.xml
#	indra/newview/skins/default/xui/zh/panel_main_inventory.xml
 2023-12-15 18:25:32 +01:00
Ansariel 881eb4fd02 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-12-15 18:23:24 +01:00
Andrey Lihatskiy 793bed7d06 Merge branch 'main' into DRTVWR-489 
# Conflicts:
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
 2023-12-15 07:06:15 +02:00
Pork Chop f05fa29db1 Linux: Update libndofdev 0.13 -> 0.14. Update SDL2 to latest stable release (2.28.5) 2023-12-14 14:26:56 +11:00
Andrey Lihatskiy 4b98ae6e8a Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W 
# Conflicts:
#	indra/newview/llspatialpartition.cpp
 2023-12-14 02:47:44 +02:00
Pork Chop bdcd99861c Linux: replace cubemaptoequirectangular with a version that actually has CubemapToEquirectangular.js in it... 2023-12-13 21:49:00 +11:00
Andrey Lihatskiy 88921452ad DRTVWR-489 Restore autobuild.xml format 2023-12-13 06:26:06 +02:00
Andrey Lihatskiy 5b789e05f5 DRTVWR-489 Update freetype to v.2.12.1.557becd 2023-12-12 19:02:54 +02:00
Ansariel 7f8931fd96 Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer 
# Conflicts:
#	.github/release.yaml
#	autobuild.xml
#	indra/newview/llscrollingpanelparam.cpp
 2023-12-12 12:57:27 +01:00
Alexander Gavriliuk eff5958c11 Fix formatting in autobuild.xml (indents in close tags) 2023-12-05 20:37:21 +01:00
Andrey Lihatskiy 86a437d96c DRTVWR-587 Update llca to version 202312051404.0 2023-12-05 18:40:08 +02:00
Andrey Lihatskiy 07ace73c49 DRTVWR-587 Update llca to version 202312051404.0 2023-12-05 16:17:04 +02:00
Alexander Gavriliuk c9cd5631e4 Merge branch 'main' into DRTVWR-489 2023-12-05 03:37:06 +01:00
Ansariel 50c7296d34 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llvoavatar.cpp
 2023-12-01 11:27:42 +01:00
Ansariel cfd9c49647 Merge branch 'DRTVWR-587-maint-V' of H:/ViewerDev/viewer-587 
# Conflicts:
#	.gitignore
 2023-11-30 18:44:01 +01:00
Ansariel c87063987c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-11-30 18:41:42 +01:00
Andrey Lihatskiy c409236dac Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge 
# Conflicts:
#	indra/newview/llinventorygallery.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-11-30 18:09:29 +02:00
Andrey Lihatskiy d1c0a5b840 Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge 
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewergenericmessage.cpp
#	indra/newview/llvoavatar.cpp
 2023-11-29 10:45:43 +02:00
Nat Goodspeed 974a2a1d40 DRTVWR-587: Update to viewer-manager v3.0-08bf5ee. 
This viewer-manager refactors the bad-graphics-card detection.
 2023-11-22 14:12:46 -05:00
Nat Goodspeed faadebbb69 DRTVWR-594: Update kdu version from the updated package. 2023-11-22 10:25:06 -05:00
Nat Goodspeed fe30ed1b49 DRTVWR-594: Update havok-source with havok-libs per recent PR. 2023-11-21 17:02:52 -05:00
Nat Goodspeed 8e3253dc1a DRTVWR-594: Update kdu per recent PR 2023-11-21 16:36:13 -05:00
Nat Goodspeed 426cf29278 DRTVWR-594: Update dictionaries, glh_linear, havok-source 
per recent PRs. Actually the havok-source update is for a new havok-llvm build.
 2023-11-21 15:34:26 -05:00
Andrey Kleshchev a963ba296e SL-20591 Update viewer-manager to v3.0.0170afb 
Restored removed commits since issue was isolated and bypassed.

Original issue: win32util.py imports wmi, if import fails it uses
registry for getting dns, if import works, it uses wmi to get dns.
Including wmi broke dns for some of the users ([Errno 11001] Name or
service not known)
 2023-11-21 19:33:54 +02:00
Ansariel be71515833 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-11-20 13:05:09 +01:00
Beq b3276e50b1 Update KDU to 8.4.1 for all platforms. 2023-11-18 02:23:58 +00:00
Andrey Kleshchev 2f735f6909 SL-20591 Update viewer-manager to v3.0.73fef89 2023-11-17 02:33:53 +02:00
Ansariel a7e68395b2 Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer 2023-11-15 11:34:13 +01:00
Ansariel 198bd5cfc0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/lldrawable.cpp
 2023-11-15 11:33:41 +01:00
Pork Chop 3eeddf0a55 Clean up any stragglers using the old phoenixviewer domain for 3p libraries (seemed to be just gstreamer for linux), change URL's to use HTTPS where supported instead of plain old HTTP 2023-11-12 11:04:20 +11:00
Andrey Lihatskiy 96f7f708c1 SL-20591 Update viewer-manager to v3.0.0395b15 2023-11-10 01:57:27 +02:00
Ansariel aa847c1bac Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-11-07 10:23:48 +01:00
Andrey Kleshchev 9b6a90eedd Revert "SL-20185 Fix connection issues (#490)" 
Issue reproed again, restoring.
 2023-11-06 20:41:01 +02:00
Pork Chop 5827e92a9a Linux: Update dullahan again (use-gl=desktop was messing things up), the default in CEF seems to now be to use the Angle compatibility layer to figure out what works. Some corrections to the viewer manifest file, the EGL/GLES libraries (which Angle needs) now reside in a different folder with recent CEF builds, so update accordingly. Moved CEF locales from bin -> lib folder as CEF was complaining about not being able to find its locales 2023-11-06 19:00:16 +11:00
Pork Chop 835305e9d8 Linux: dullahan+cef update to 1.14/118.0.5993.117 2023-11-05 13:20:47 +11:00
akleshchev 6aa4a267a7
SL-20185 Fix connection issues (#490) 2023-11-03 00:10:50 +02:00
Ansariel f47a2bddaa Ditch Github credentials requirements for our private libs 2023-11-02 21:56:05 +01:00
Pork Chop 698168efbe Linux: Remove conflicting xmlrpc_epi package and revert back to a working one 2023-11-02 14:30:48 +11:00
Pork Chop aa440ccd28 Linux: Remove conflicting xmlrpc_epi package and revert back to a working one 2023-11-02 14:06:54 +11:00
Andrey Lihatskiy 54bfff622d DRTVWR-594 Update LLCA to v202311020117.0-0f5d9c3 2023-11-02 01:23:33 +02:00
Ansariel 34d2a78898 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llviewergenericmessage.cpp
 2023-11-01 13:44:17 +01:00
Nat Goodspeed 66ae2434bc DRTVWR-587: Update viewer-manager to v3.0-074736e. 
This is viewer-manager's DRTVWR-587-actions branch updated from the new master
branch.
 2023-10-31 13:40:07 -04:00
Nat Goodspeed b5c7c6b078 SL-20031: Reintroduce newest viewer-manager build. 2023-10-31 11:04:41 -04:00
Ansariel b64793e2b0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-27 16:24:33 +02:00
Ansariel 6c389316f1 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llrender/llrender.h
#	indra/newview/VIEWER_VERSION.txt
 2023-10-27 13:00:41 +02:00
Ansariel 70db255e02 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	.github/workflows/build.yaml
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llcommon/tests/workqueue_test.cpp
#	indra/newview/VIEWER_VERSION.txt
 2023-10-27 11:52:59 +02:00
Beq a7578e9690 Update autobuild for Mac fmodstudio 2.02.18 
GHA builds already have this, this change keeps the autobuild in step
 2023-10-27 10:03:43 +01:00
Ansariel 5f9fb4a395 Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
#	indra/newview/installers/darwin/release-dmg/background.jpg
#	scripts/messages/message_template.msg.sha1
 2023-10-26 21:25:27 +02:00
Ansariel 39a6735fc9 Merge branch 'main' of https://github.com/secondlife/viewer 
# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/cmake/APR.cmake
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/viewer_manifest.py
#	indra/test/namedtempfile.h
 2023-10-26 15:49:12 +02:00
Brad Linden 673b3309dd Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-10-25 16:12:13 -07:00
Andrey Lihatskiy 4c6ae49c88 Merge branch 'main' into DRTVWR-587-maint-V 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/tests/llleap_test.cpp
#	indra/newview/viewer_manifest.py
 2023-10-25 21:28:26 +03:00
Nat Goodspeed 56911455e0 SL-18837: Update dullahan to v118.0.5993.54 
This includes this week's CEF 118.
 2023-10-13 09:32:53 -04:00
Nat Goodspeed be5a6e6179 SL-18837: Update openal to v1.23.1-18e315c 2023-10-12 13:32:50 -04:00
Nat Goodspeed 787ca67b5f SL-18837: Update llca to v202310121525.0-d22bd98 2023-10-12 11:32:25 -04:00
Ansariel eeeeefadb7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-11 11:25:27 +02:00
Andrey Lihatskiy 067f3790da SL-18943 Update LLCA to 202310110702.0 2023-10-11 10:27:39 +03:00
Andrey Lihatskiy 660a9a3385 SL-18943 Update LLCA to 202310110655.0 2023-10-11 09:57:57 +03:00
Andrey Lihatskiy 9415d45848 DRTVWR-587 Update viewer-manager to 3.0-f48e635 2023-10-10 22:51:16 +03:00
Ansariel bff2f43009 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-10-09 10:38:46 +02:00
Pork Chop 188b3ae9b1 FMOD Studio update to 2.02.18 for Linux 2023-10-08 00:11:28 +11:00
Ansariel 352d39e3df FMOD Studio update to 2.02.08 for Windows 2023-10-07 14:01:17 +02:00
Nat Goodspeed 6d3fa5f13f SL-18837: Update Tracy to 0.8.1-235e98f 2023-10-06 12:25:13 -04:00
Nat Goodspeed 909371d080 SL-18837: Remove 32-bit Windows package entries. 
glext, which contains only header files, now builds only a single common
package instead of platform-specific ones. But as long as we retain the
platform-specific URLs, autobuild will continue to prefer those over the
common platform. Remove all platform-specific glext package entries.
 2023-10-06 11:52:42 -04:00
Nat Goodspeed 093b6a1494 SL-18837: Update to Dullahan 1.14.0 with CEF 117 2023-10-06 06:55:34 -04:00
Ansariel 49bbb565b6 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llpanelemojicomplete.cpp
#	indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
 2023-10-04 16:56:32 +02:00
Ansariel 0a928bf1fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llagent.cpp
#	indra/newview/llfloaternewfeaturenotification.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llsidepaneltaskinfo.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
 2023-10-04 11:38:21 +02:00
Pork Chop ef373cc849 Linux: Update SDL to v2.28.4 2023-10-02 22:35:08 +11:00
Pork Chop d2ec35f19e Linux: Update curl,openssl and nghttp2 libraries 2023-10-02 22:34:33 +11:00
Nat Goodspeed b8e6777439 SL-18837: Merge branch 'main' into actions 2023-09-07 11:15:56 -04:00
Ansariel f075bf7599 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	.github/workflows/build_viewer.yml
#	indra/newview/llface.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewerregion.cpp
 2023-08-31 18:09:40 +02:00
Ansariel 37d04235fe Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-08-30 14:38:51 +02:00
Beq 3dddbe6c7d Update FMOD Studio to 2.02.17 on MacOs 2023-08-28 19:49:53 +01:00
Andrey Lihatskiy 147def0fdb SL-20130 Update viewer-manager (win64) to build 3.0-83fb46a 2023-08-28 20:40:30 +03:00
Andrey Lihatskiy dc384d6046 SL-20130 Update viewer-manager to build 3.0-83fb46a 2023-08-28 20:21:11 +03:00
Pork Chop f1c0cd9a2f Update FMOD Studio to 2.02.17 on Linux 2023-08-29 01:25:31 +10:00
Ansariel 88cc136054 Update FMOD Studio to 2.02.17 on Windows 2023-08-28 16:06:43 +02:00
Beq bcb701af65 How about the checksums too, Beq? 2023-08-28 14:05:17 +01:00
Ansariel c9575bf8b7 3p KDU for Windows contains both 32 and 64 bit version 2023-08-28 14:55:04 +02:00
Beq 635eabcc4c Update autobuild for KDU-8.3 2023-08-28 13:37:18 +01:00
Ansariel 701cf51cd7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llmath/llvolume.cpp
#	indra/llrender/llgl.cpp
#	indra/llxml/llcontrol.cpp
#	indra/newview/llpanelnearbymedia.cpp
#	indra/newview/llsceneview.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-08-25 02:57:48 +02:00
Ansariel 4b923d4291 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerregion.h
 2023-08-24 20:48:55 +02:00
Andrey Kleshchev 7373fd91fa Merge remote-tracking branch 'origin/main' into DRTVWR-489 
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llmath/llvolume.cpp
#	indra/llrender/llgl.cpp
#	indra/llxml/llcontrol.cpp
#	indra/newview/llpanelnearbymedia.cpp
#	indra/newview/llsceneview.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-08-24 01:23:52 +03:00
Brad Linden c6d5f11f63 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-08-23 12:26:14 -07:00
Andrey Lihatskiy ab000b4dce SL-16671 Add "Bellisseria" to the viewer dictionary 2023-08-03 01:13:29 +03:00
Andrey Lihatskiy c704a5fb62 DRTVWR-582 Update llca to build 202305160024.0 2023-08-02 15:00:13 +03:00
Ansariel 5dd820c22d Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
 2023-07-29 14:35:11 +02:00
Nat Goodspeed 1f615e78b8 SL-20031: Update to viewer-manager 3.0-bd3aec2. 
This one includes the fix for SL-19756.
 2023-07-28 11:04:01 +03:00
Nat Goodspeed f6505f5a40 SL-20031: Update viewer-manager to 3.0-5cfc07c. 
This version eliminates references to the Windows wmic command, calling the
WMI API instead.
 2023-07-28 11:04:01 +03:00
Nat Goodspeed 248f78b45e SL-19854: Update bugsplat to release v1.0.7-527603a. 2023-07-21 10:24:46 -04:00
Nat Goodspeed bbb192eb79 SL-19854: Update bugsplat to release v1.0.7.86a960a. 2023-07-18 16:26:28 -04:00
Nat Goodspeed 6f1e7d58e3 SL-18837: Update llphysicsextensions_source to release v1.0.c93156d. 2023-07-14 10:17:13 -04:00
Ansariel d3c3df624b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/fsfloaterim.h
 2023-07-13 09:22:50 +02:00
Ansariel 497ecef127 Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/installers/windows/installer_template.nsi
 2023-07-12 11:54:32 +02:00
Nat Goodspeed 41a738591e SL-18837: Update apr_suite to release v1.7.2-e935465. 2023-07-10 13:21:02 -04:00
Andrey Lihatskiy 411aa59734 SL-19756 Update viewer-manager to 3.0.580913 2023-07-07 06:36:15 +03:00
Ansariel 317d4f7b0e Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/00-Common.cmake
#	indra/newview/installers/windows/installer_template.nsi
 2023-07-04 14:48:18 +02:00
Nat Goodspeed 726851b039 DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen 
to resolve conflicts in installer_template.nsi
 2023-06-28 11:02:11 -04:00
Ansariel 70e4fcaf94 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-06-27 12:21:43 +02:00
Ansariel 521dd2ff96 FMOD Studio 2.02.15 update for OSX 2023-06-23 23:23:30 +02:00
Pork Chop 156b22f28c Linux: FMOD Studio update to 2.02.15 2023-06-24 00:35:02 +10:00
Ansariel c7246d5c22 FMOD Studio update to 2.02.15 for Windows 2023-06-23 13:23:38 +02:00
Brad Linden 3ffa57473d Revert "SL-18837: On Windows, try using py.exe Python stub." 
This reverts commit 996ea03d87.
 2023-06-07 14:48:24 -07:00
Nat Goodspeed 996ea03d87 SL-18837: On Windows, try using py.exe Python stub. 2023-06-07 09:31:10 -04:00
Nat Goodspeed 6503c0b2b8 SL-18837: Update apr_suite to release v1.7.2-4d6fcb2. 2023-06-05 10:53:14 -04:00
Nat Goodspeed 659af42ff8 SL-18837: Update apr_suite to release v1.7.2-fb873f5. 2023-06-02 16:05:36 -04:00
Nat Goodspeed 1d43352652 SL-18837: Update libxml2, minizip-ng, colladadom 
Update libxml2 to release v2.9.4.7476681.
Update minizip-ng to release v3.0.2.3e9876e.
Update colladadom to release v2.3.d1ef72a.
 2023-06-02 13:18:35 -04:00
Ansariel aebe458306 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	README.md
#	autobuild.xml
 2023-05-31 11:41:09 +02:00
Callum Prentice 886c608967 DRTVWR-489: Incorporate new 3p libs for Collada and NanoSVG that have both been built after merging with master (and VS 2022 for Collada DOM). 2023-05-30 16:14:45 -07:00
Callum Prentice 7feba33415 DRTVWR-489: Update NanoSVG build to keep readiness report happier. Remove reference to Linux version of ColladaDOM - out of date, we don't have a newer build and it's making the Readiness Report sad. 2023-05-25 10:33:45 -07:00
Callum Prentice b6d4a373a4 DRTVWR-489: Trying to determine why the DRTVWR Readiness Report gets sad about the NanoSVG package - I didn't think it's analysis applied to Linux 3p packages but maybe it does 2023-05-24 11:58:00 -07:00
Callum Prentice fbccf6119d DRTVWR-489: Pull in a new build of 3p-colladadom that has the same version for all 3 platforms/bit widths (580295) - previously, the macOS version was different and the DRTVWR Readiness Script got sad about it 2023-05-23 11:11:13 -07:00
Ansariel 0dfcb8fb53 Updated Havok lib - only 64bit Windows and OSX so far 2023-05-20 00:38:11 +02:00
Nat Goodspeed 3ff43893da SL-18837: Update boost, googlemock 
Update boost to release v1.81-90bb2df.
Update googlemock to release v1.7.0.77bba00.
 2023-05-19 17:08:35 -04:00
Nat Goodspeed ff995bbba4 SL-18837: Next batch of GitHub actions build updates 2023-05-19 15:08:23 -04:00
Ansariel ce7b2e96d0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llinventory/llsettingssky.cpp
#	indra/newview/llpathfindingnavmesh.cpp
 2023-05-18 12:25:20 +02:00
Ansariel d927ba575a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llqueuedthread.h
#	indra/llcommon/lluuid.cpp
#	indra/llcommon/llworkerthread.cpp
#	indra/llimage/llimageworker.h
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewermenu.cpp
 2023-05-17 21:40:54 +02:00
Callum Prentice f45e888c90 Some small tweaks after merge with Viewer release 2023-05-17 11:31:45 -07:00
Brad Linden 2f44377b3e Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-05-17 11:17:48 -07:00
Ansariel 9057bfc995 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llcallstack.h
#	indra/llinventory/llsettingssky.cpp
#	indra/llmath/llvolume.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llviewerstats.cpp
#	indra/newview/llvoavatar.cpp
 2023-05-05 12:35:33 +02:00
Brad Linden 7c1ccdc9a4
Merge pull request #179 from secondlife/brad/mac-nightly-builds 
enable github actions mac nightly builds
 2023-05-04 11:49:33 -07:00
Brad Linden 52f8ff9961 Merge remote-tracking branch 'origin/SL-19594-restore' into DRTVWR-559 2023-05-04 11:38:52 -07:00
Nat Goodspeed 1910eb6ae6 SL-19594: Update to bugsplat build 579669 2023-05-04 09:34:37 -04:00
Brad Linden e41cb7b5db Further attempts to get actions based nightly mac builds working for DRTVWR-559 2023-05-03 15:23:32 -07:00
Ansariel 5572a4c392 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
 2023-05-03 13:11:42 +02:00
Ansariel 2a6c81f1d6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-02 17:52:00 +02:00
Ansariel 11e9d2cdb6 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpool.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/lldrawpoolmaterials.cpp
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llperfstats.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_adjust_environment.xml
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/panel_performance_preferences.xml
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
#	indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
 2023-04-29 23:32:04 +02:00
Brad Linden f5cf0cf876
Update glext package in attempt to fix DRTVWR-559 viewer readiness report errors (#194) 2023-04-28 09:46:41 -07:00
Ansariel ffa21ae649 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539 
# Conflicts:
#	autobuild.xml
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable_linux.txt
#	indra/newview/fsfloaterperformance.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpool.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/lldrawpoolmaterials.cpp
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llperfstats.cpp
#	indra/newview/llperfstats.h
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
 2023-04-28 00:39:47 +02:00
Ansariel 1aba1c157a Fix linux build 2023-04-24 12:29:20 +02:00
Ansariel 1ded14fa3d Fix linux build 2023-04-24 12:28:00 +02:00
Ansariel 8d3e2d1ead Fix linux build 2023-04-24 12:26:13 +02:00
Ansariel 0d5282a99e Add missing build targets 2023-04-22 18:55:00 +02:00
Ansariel 7e563d3120 Sync autobuild with upstream 2023-04-22 18:54:59 +02:00
Ansariel 054d2e1d33 Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-04-22 18:54:43 +02:00
Ansariel 719a2d31dc Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llui/llscrolllistctrl.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/textures/textures.xml
 2023-04-22 12:02:23 +02:00
Ansariel 8ffa65d424 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-04-22 11:54:28 +02:00
Ansariel 34c04a22cf Add missing build targets 2023-04-22 02:02:59 +02:00
Ansariel d3dc0e1e27 Add missing build targets 2023-04-22 02:01:37 +02:00
Ansariel 505c01c007 Sync autobuild with upstream 2023-04-22 01:44:13 +02:00
Ansariel a514fa7b19 Sync autobuild with upstream 2023-04-22 01:43:09 +02:00