Ansariel
|
94a7b3ab8e
|
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
|
2023-04-21 15:14:43 +02:00 |
|
Ansariel
|
76e3d31179
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-04-21 15:10:54 +02:00 |
|
Ansariel
|
62730c5d41
|
Fix bug in German translation
|
2023-04-21 14:25:44 +02:00 |
|
Ansariel
|
7dfe73540c
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-04-21 12:23:05 +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 Lihatskiy
|
4e47e532f8
|
Merge branch 'SL-19594-fakesmile' into DRTVWR-577-maint-S
|
2023-04-19 23:15:28 +03:00 |
|
Nat Goodspeed
|
86846ffb8d
|
SL-19594: Update to bugsplat build 579696
|
2023-04-19 15:35:47 -04:00 |
|
Beq
|
ab64614bbc
|
Disable bumplist threading until it can be proven to be useful
|
2023-04-15 12:36:15 +01: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
|
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 |
|
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
|
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 |
|
Andrey Kleshchev
|
6d2bfe7ea2
|
SL-17659 The display name reset button
|
2023-04-03 21:41:05 +03: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 |
|
Beq
|
110096438e
|
Typo in CMake breaks Mac.
|
2023-04-03 13:14:41 +01:00 |
|
Beq
|
fc4181b478
|
Odd merge issue and ignore more crap.
|
2023-04-03 12:39:43 +01:00 |
|
Zi Ree
|
8ef61f6171
|
Remove stray comment marker, oops!
|
2023-04-03 05:30:49 +02:00 |
|
PanteraPolnocy
|
13e8028c9f
|
Removing the duplicate which I noticed a second too late
|
2023-04-02 23:56:58 +02:00 |
|
PanteraPolnocy
|
1d69d5a3f7
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-04-02 23:46:51 +02:00 |
|
PanteraPolnocy
|
3aaebe8ac4
|
FIRE-32846, FIRE-32845 Updated French (Laurent Bechir), Russian (Romka Swallowtail) and Polish translations, minor adjustments to English one
|
2023-04-02 23:46:42 +02:00 |
|
Pork Chop
|
b1e8f003e6
|
Linux: Update various 3p libraries
|
2023-04-02 23:07:44 +10:00 |
|
Ansariel
|
377ee00657
|
Remove some apparently orphaned CMake files
|
2023-04-01 19:36:01 +02:00 |
|
Ansariel
|
068d2a9b02
|
Fix disk cache after merge
|
2023-04-01 16:16:53 +02:00 |
|
Andrey Kleshchev
|
a6daa3a26d
|
SL-19432 External group links dont load in SL
|
2023-03-31 17:47:07 +03:00 |
|
Ansariel
|
7625a540e4
|
FMOD Studio update to 2.02.13 for crappy Mac, attempt #2
|
2023-03-31 09:46:42 +02:00 |
|
Pork Chop
|
934616de29
|
Linux: Restore more linux specific cmake configuration that went bye bye in the last merge - fixes the ability to toggle between internal/external browsers in preferences
|
2023-03-31 01:07:46 +11:00 |
|
Andrey Kleshchev
|
302bfb6e81
|
SL-19491 Revert SL-19346
This reverts part of commit 0c2b00efaa.
|
2023-03-30 16:15:51 +03:00 |
|
Pork Chop
|
e5c681ce8e
|
Linux: Restore crashreporting (hopefully)
|
2023-03-31 00:05:29 +11:00 |
|
Ansariel
|
071b8b0dbb
|
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/skins/default/xui/es/floater_tools.xml
|
2023-03-30 12:21:46 +02:00 |
|
Ansariel
|
36fc36432d
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/cmake/CMakeLists.txt
|
2023-03-30 12:20:59 +02:00 |