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

69220 Commits (719a2d31dc29f3260b45c89862dd67f314331ed5)

Author SHA1 Message Date
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 407c2e59f7 Print out what package failed, m'kay? 2023-04-22 01:09:32 +02:00
Ansariel 62730c5d41 Fix bug in German translation 2023-04-21 14:25:44 +02:00
Callum Prentice e246e811fa DRTVWR-489: Pull in SL-19594 Update to Bugsplat that doesn't block on failure to upload PBDs - this means we need to upload symbols for this build to Bugsplat manually if we want meaningful crash reports 2023-04-20 08:47:18 -07:00
Callum Linden a7eef57c1f
Merge pull request #183 from secondlife/SL-19575a 
SL-19575 LLFloaterEmojiPicker - Add filter by category
 2023-04-20 07:19:26 -07:00
Alexander Gavriliuk 97b0ba2a6d SL-19575 LLFloaterEmojiPicker - Add filter by category 2023-04-20 03:55:02 +02:00
Zi Ree 1ac600f383 FIRE-32893 - fix crash on image upload, make sure to grab the checkbox pointer even when there is no alpha channel at all 2023-04-20 03:49:52 +02:00
Andrey Kleshchev dc5ef88e31 SL-19623 Updated contributions 2023-04-19 20:31:37 +03:00
akleshchev f78773f0c9
SL-19623 Merge 'CMake' pull request #150 from Ansariel 
Fix CMake files related to ICU4C
 2023-04-19 20:12:48 +03:00
Beq ab64614bbc Disable bumplist threading until it can be proven to be useful 2023-04-15 12:36:15 +01:00
Callum Prentice 8dad411e90 SL-19575: Emoji gallery - couple of tweaks that mac Clang got sad about 2023-04-14 09:05:14 -07:00
Alexander Gavriliuk ff7ebf0892 SL-19575 Create emoji gallery access icon 2023-04-14 17:27:30 +02:00
Callum Prentice 638a45cbb1 DRTVWR-489: Pull in updated version of BugSplat to work around their change in TLS on 2023-04-11 2023-04-13 15:44:40 -07:00
Callum Prentice 602d7ea138 SL-19368: update copyright information in Viewer Fonts description that eventually ends up in the Credits panel of Help->About - new 3p viewer fonts package 2023-04-11 14:18:23 -07:00
Callum Prentice 978a5b66f2 SL-19139 Credits for Kitty - update the contributors.txt file with a mention of Kitty's large contribution. (No externally facing JIRA that I can find) 2023-04-11 11:26:37 -07:00
Callum Prentice 12e044755e SL-19078: changes to autobuild to unpack the emoji/shortcode 3p library and then copy the XML files to the right place in the Viewer dev tree (indra/newview/skins/xui/*/emoji_characters.xml) 2023-04-10 17:01:10 -07:00
Callum Prentice 351faf283a SL-19078: pull in 3p versions of the emoji/shortcode mapping XML files - 1 for each language that the viewer supports except sadly, Turkish which is not available so far 2023-04-10 16:59:45 -07:00
Callum Prentice 93717f14ca SL-19078: add filename of emoji/shortcode XML files to ignore list so Viewer checkouts don't appear to be polluted with files from 3p libs 2023-04-10 16:58:55 -07:00
Callum Prentice 1bc57d0ae0 SL-19078: the emoji/short-code mappings come in via a 3p package now 2023-04-10 16:57:48 -07:00
PanteraPolnocy 77c2e94590 FIRE-32851, FIRE-32853 French (Laurent Bechir) and Russian (Romka Swallowtail) translation update (floater_image_preview) 2023-04-10 23:52:42 +02:00
Ansariel 2b6d9801bb Remove obsolete HAS_GROWL compile definition 2023-04-06 12:40:16 +02:00
Ansariel 766acfa818 More CMake cleanup 2023-04-06 11:43:15 +02:00
Ansariel b0b1d592ea Modernize Discord CMake 2023-04-05 13:14:08 +02:00
Ansariel 256157eba8 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/newview/CMakeLists.txt
 2023-04-05 11:56:57 +02:00
Ansariel 9825c45335 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/llcommon/CMakeLists.txt
#	indra/newview/CMakeLists.txt
 2023-04-05 10:56:12 +02:00
Ansariel 23b0537fff Update German translation 2023-04-05 01:50:03 +02:00
PanteraPolnocy 9a046ee48d FIRE-32849 French translation update, by Laurent Bechir 2023-04-04 19:17:06 +02:00
PanteraPolnocy 480cb4e75c Updated Polish translation (image preview) 2023-04-04 19:08:20 +02:00
Zi Ree e770782e99 Image upload preview now tells you the final upload size and alpha status, also some minor XUI cleanup and alignment 2023-04-04 13:49:53 +02:00
Ansariel 25f20cfd59 const ref please! 2023-04-04 13:16:14 +02:00
Ansariel 2428f9754a Remove unused members 2023-04-04 13:10:58 +02:00
Ansariel 4e35c399a6 Fix copy dependencies 2023-04-04 13:08:59 +02:00
Zi Ree 29b9da8895 Make upload image preview area to be not hard-coded but follow one XUI element, so the UI can be changed easier without changing code. 2023-04-04 11:10:51 +02:00
Pork Chop 83c45e8237 Linux: Minor cmake cleanup in MediaPluginBase, no longer needs glib 2023-04-04 13:46:06 +10:00
Zi Ree ff3aa5f436 Linux: take out glib dependency from volume catcher, restore cef functionality, some cmake cleanup by PorkChop 2023-04-04 05:38:46 +02:00
Callum Prentice 68612324b8 DRTVWR-489: pull in a version of 3p-ICU4C from the branch called DRTVWR-489-emoji (identical to VS 2019) but lines up the branches for the otehr 3P packages this work uses 2023-04-03 20:19:07 -07:00
Pork Chop 63eafec8d8 Linux: Update 3p again, wrong colladadom 3p (and associated 3p's it depended on) had crept into the dependency chain. 2023-04-04 12:06:28 +10:00
Ansariel 337d2f984f Fix CMake files related to ICU4C 2023-04-04 03:32:40 +02:00
Callum Prentice 28b240fd7f DRTVWR-489: Fix things up after a messy merge with main because of a gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now. 2023-04-03 14:58:58 -07:00
Ansariel 588d8a01e6 Update German translation 2023-04-03 22:52:15 +02:00
Ansariel 9895b2f5dc Keep original LL code please 2023-04-03 22:47:34 +02:00
Beq 2f128c90ed Merge remote-tracking branch 'origin/master' 2023-04-03 21:35:35 +01:00
PanteraPolnocy 174bb09b30 Minor cleanup in image/animation preview floaters, various languages 2023-04-03 20:40:17 +02:00
PanteraPolnocy 3aa2e83d58 Apply the animation preview floater changes to all langauges; Add tooltip and checkbox in Polish one 2023-04-03 19:50:57 +02:00
Beq 48216e7ef4 Why is Mac missing the include path? 2023-04-03 18:32:04 +01:00
Zi Ree 8c48406611 Add matching checkbox for advanced animation information to preferences 2023-04-03 18:57:57 +02:00
Zi Ree 6a40b64d0a Make advanced animation information optional and switchable on the fly. 2023-04-03 18:42:38 +02:00
Beq bdc94eac5c Merge remote-tracking branch 'origin/master' 2023-04-03 15:33:29 +01:00
Ansariel 82802e59f6 Wrong! 2023-04-03 14:34:42 +02:00