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

2823 Commits (b157ab47c00f9f5bc3bd2533f32cd12a4a7c2efd)

Author SHA1 Message Date
Ansariel b157ab47c0 Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagentui.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/llfloateravatarrendersettings.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/de/floater_tools.xml
#	indra/newview/skins/default/xui/en/floater_display_name.xml
#	indra/newview/skins/default/xui/en/floater_tools.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/ru/floater_tools.xml
 2023-01-12 16:56:08 +01:00
Andrey Lihatskiy f9866a3543 Merge branch 'main' into DRTVWR-573-maint-R 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagent.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmediasettingsgeneral.cpp
#	indra/newview/pipeline.cpp
 2023-01-12 04:37:42 +02:00
PanteraPolnocy f359a39195 Flip dates to 2023 2023-01-02 19:19:28 +01:00
Maxim Nikolenko efb96d8c6e SL-18786 Display updater on the top of other windows 2022-12-14 15:36:24 +02:00
Ansariel abbfb9b7d0 Merge branch 'DRTVWR-565-maint-P' of https://github.com/secondlife/viewer 2022-11-22 16:23:13 +01:00
Ansariel 02804db43b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-22 16:21:05 +01:00
Ansariel dbc70be7c4 Merge branch 'master' of https://github.com/secondlife/viewer 
# Conflicts:
#	README.md
#	autobuild.xml
 2022-11-21 20:37:32 +01:00
Andrey Kleshchev 96f0c95898 Merge branch master into DRTVWR-565-maint-P 2022-11-21 20:48:24 +02:00
Mnikolenko Productengine bedbd98017 SL-18603 update Bugsplat 2022-11-11 23:05:25 +02:00
Ansariel 10588d606e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-02 12:54:26 +01:00
Zi Ree 66cecee628 Linux: Update fontconfig and freetype to remove old zlib dependency - Thanks to PorkChop! 2022-10-30 20:30:12 +01:00
Ansariel e4816961a4 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-10-22 16:53:15 +02:00
Kitty Barnett f7721b5386 Update FMOD Studio to 2.02.09 on Mac 2022-10-21 23:34:40 +02:00
Zi Ree 534a156f2b Linux: Update PNG library to have one less dependency on old zlib - Patch and 3p build by PorkChop, thank you! 2022-10-21 01:43:36 +02:00
Bennett Goble ffc6ed2a93 SL-18218: Switch canonical_repo to GitHub URL 2022-10-17 13:22:56 -07:00
Zi Ree 1a17c8df44 Linux: fmodstudio update, patch by PorkChop, thank you! 2022-10-17 05:01:18 +02:00
Ansariel 562fd838a2 Update FMOD Studio to 2.02.09 on Windows 2022-10-16 12:21:35 +02:00
Zi Ree 1add5d049a Linux/SDL2: update to SDL2-24-0, thanks PorkChop - might already help with FIRE-32074 2022-10-15 16:02:21 +02:00
Andrey Kleshchev 46d4775eca SL-18378 Update fmod studio to 2.02.09 
Should fix some common crashes for parcel media
 2022-10-14 20:16:31 +03:00
Ansariel 31c3417ce6 Update FMOD Studio on OSX with package built by Kitty 2022-09-26 14:44:49 +02:00
Zi Ree 3e52bb4314 Linux - FModStudio update - packaged by PorkChop, thank you! 2022-09-23 17:40:59 +02:00
Ansariel 1b3bf53ff3 Update FMOD Studio to 2.02.08 on Windows 2022-09-23 12:36:28 +02:00
Zi Ree 71ab85a0c2 Linux - Update jemalloc 3p library for better memory management - Patch by PorkChop, thank you! 2022-09-20 17:46:35 +02:00
Zi Ree 09a30fa49e Fixed bogus SDL2 conflicts every time autobuild.xml was touched. Patch by PorkChop, thank you! 2022-09-18 17:14:31 +02:00
Zi Ree 85db6ad4d5 New CEF and Dullahan for Linux, picking up fixes for MOAP issues - new libraries built by PorkChop. Thank you! 2022-09-17 05:41:29 +02:00
Nat Goodspeed 5f1c8d3119 SL-18068: Update to viewer-manager build 575083 2022-09-16 16:24:05 -04:00
Ansariel cf85e854e5 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-09-15 21:14:13 +02:00
Callum Linden 3248eb87dc SL-18151 [SEC] MOAP can force multiple floaters open on users screen: The Viewer part of the fix for this JIRA - pulls in the updated Dullahan that exposes the user_gesture/is_redirect flags and uses them to determine what type of 'nav_type' is exchanged with viewer/plugin 2022-09-14 14:52:31 -07:00
Ansariel db864c11cd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-13 20:14:22 +02:00
Liny 745ad55aa2 Fix FIRE-32044 Voice cannot be used in a pure 64-bit Linux environment. 2022-09-10 16:37:14 -07:00
Zi Ree 6d3248cc17 FIRE-31945 - 3p-SDL2 rebuild done by PorkChop to include inpout methods for japanese text entry in the configure flags, as an attempt to fix this issue 2022-09-09 17:49:58 +02:00
Zi Ree c987ab1bbe Update libndof to use SDL2 - patch by PorkChop, thank you! 2022-09-02 16:58:25 +02:00
Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 16:04:49 +02:00
Nicky 6f2265d387 Linux; Updated colladadom, compiled for C++17 support; Original author "Pork Chop <mygoditsfullofstars@phoenixviewer.com>" 2022-08-14 16:03:39 +02:00
Nicky c7e04f0cae Mac; Update Collada with a C++17 compatible version. 2022-08-11 22:29:02 +02:00
Ansariel 4d5b5a5ae3 Enable c++17 since it seems LL is hesitant to finally do it... 2022-08-11 21:56:48 +02:00
Ansariel 11e6cf4980 Fix wrong name 2022-08-10 19:32:37 +02:00
Nicky 1147d8ee1e Update fmodstudio 2022-08-07 14:22:52 +02:00
Ansariel d7953c1e94 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-02 12:03:54 +02:00
Zi Ree 5230df4b14 Linux - Update 3p libs, fix linux-crash-logger, contributed by Pork Chop, thank you! 2022-08-01 13:35:25 +02:00
Ansariel f583a8233d No need for 32bit OSX/Linux GLOD 2022-08-01 12:08:59 +02:00
Beq 00875f93d0 Restore GLOD alongside MeshOpt 2022-07-31 22:11:35 +01:00
Nicky 5be4dd156c OSX; update fmodstudio to 2.02.07 2022-07-24 13:20:32 +02:00
Ansariel d407396a00 Update FMOD Studio to 2.02.07 on Windows 2022-07-23 12:54:26 +02:00
Ansariel 9300613edc Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-06-29 21:57:31 +02:00
Ansariel fc11575657 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-29 20:28:29 +02:00
Andrey Lihatskiy 77ce594dec Merge branch 'master' into DRTVWR-544-maint 2022-06-29 20:31:17 +03:00
Ansariel bd414ee0d0 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-06-29 17:21:22 +02:00
Ansariel a0c7370ce3 Update Havok 2022-06-03 20:26:02 +02:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
 2022-05-31 01:58:09 +03:00