Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1765 commits
Select commit Hold shift + click to select a range
570b0d3
[VMM] Make the marketplace panel a dropzone, drag and drop anywhere~
LiruMouse Jan 17, 2020
450afff
[VMM] Drop zone is no longer WIP, and neither are the tabs
LiruMouse Jan 17, 2020
2ffc99a
Clean up useless code
LiruMouse Jan 18, 2020
e9d28ee
Inventory offers should link offerer avatar/group name
LiruMouse Jan 18, 2020
e3318fb
Add missing Nvidia GTX cards to gpu table. Used Cool VL Viewer's sou…
RouterGray Jan 20, 2020
67126ab
Wooops, our update checker is broken since the beta started!
LiruMouse Jan 20, 2020
1fd6e91
Clean up update checker dependencies
LiruMouse Jan 20, 2020
deafc68
Fix crashes from badly formed json responses (LL's fault)
LiruMouse Jan 21, 2020
deade44
Fix login favorites and copy Landmark SLURL missing z-axis (height)
LiruMouse Jan 21, 2020
27d4e05
Prevent crash 37
LiruMouse Jan 21, 2020
851b365
Improve AISv3 code to retry less aggressively
LiruMouse Jan 21, 2020
4b2e358
Sync LLInventoryModel and LLViewerInventory with upstream
LiruMouse Jan 21, 2020
138cf5d
[AIS] Apparently friending a class isn't friendly enough.
RouterGray Jan 22, 2020
a9e2672
[Lib] Update Linux Fmod to 2.00.07
RouterGray Jan 22, 2020
9a53824
Move click_for_profile into LLNameUI base for use in nameboxes
LiruMouse Jan 25, 2020
36b75b2
A Massive Experience Tools (and Unstable Branch) Merge
LiruMouse Aug 16, 2014
49f0f8e
[XP Tools] Further UI beautification
LiruMouse Feb 7, 2020
4213983
Redo update checker responder to be more like unstable branch
LiruMouse Feb 7, 2020
44aec13
Fix crash in object weights when null selection
LiruMouse Feb 7, 2020
9548270
Buncha tinies
LiruMouse Feb 7, 2020
1853983
Request: Just show viewer's short name in update notification, not ch…
LiruMouse Feb 9, 2020
400da6e
Fix out of order and duplicate preferences
LiruMouse Feb 9, 2020
0892d14
Fix debit permission Allow being too long, and remove newlines from it
LiruMouse Feb 9, 2020
6e6fb44
Fix potential crash, thanks Rye and Testicular!
LiruMouse Feb 9, 2020
eefa0f0
Reduce reused getBOOL
LiruMouse Feb 9, 2020
199879a
Break out functions for getting object owner, owner and object slurls
LiruMouse Feb 9, 2020
703ad01
AntiSpam refactor!
LiruMouse Feb 10, 2020
7db999d
Fix copyright being 2019, thanks Del
LiruMouse Feb 11, 2020
6959b68
Fix the issue with thin resize space in inventory folder floaters
LiruMouse Feb 11, 2020
e65b513
Syncy stuffs
LiruMouse Feb 11, 2020
2f36929
Object info with right-clickable owner naame, also improve code overall
LiruMouse Feb 11, 2020
1d2c0cb
Script permission dialogs should link back to the object and its owner
LiruMouse Feb 11, 2020
3b550c3
Fix the Jira URL bug we brought up at the last TPV meeting
LiruMouse Feb 11, 2020
3073a17
Add LiruUseMarkedColor to disable use of mark color in the new places
LiruMouse Feb 11, 2020
64a44d6
Fix size and position of folder floaters not being restored from setting
LiruMouse Feb 11, 2020
2fe45cb
Fix group inventory receiveds not displaying properly in chat history
LiruMouse Feb 11, 2020
103b2c0
Fix layout of item properties floater
LiruMouse Feb 12, 2020
e34999b
Fix missing string for experience profile button tooltip in scripts
LiruMouse Feb 12, 2020
6a56d04
Don't confuse the user by showing loading when refreshing item's expe…
LiruMouse Feb 12, 2020
1ece0e6
[UI] Add Copy Folder UUID to inventory actions
RouterGray Feb 19, 2020
a52c477
Make event notifications say 'Dismiss' instead of 'Cancel'.
RouterGray Feb 23, 2020
aa95d8f
[LL] Update the login splash page for LL grids.
RouterGray Feb 24, 2020
61f0837
Make Linux and LLExperienceLog play nice. Thanks Liru.
RouterGray Feb 24, 2020
5c2c2a8
Minor cleanup. Octree vfunc reduction. Range-based for loops with map…
Shyotl Feb 25, 2020
842d1b8
Add LLIMProcessing and support for new message caps! And UserInfo cap!
LiruMouse Feb 25, 2020
0c3e144
Properly sized FMOD logo, 40 pixels high. Inspired by Alchemy, thanks…
LiruMouse Feb 25, 2020
2afd2c5
Update VLC and Dullahan. Update vcredist deployment. Thanks Alchemy!
LiruMouse Feb 25, 2020
379f97e
Buncha small fixes, mainly from alchemy
LiruMouse Feb 25, 2020
e78061b
Hide group voting tab on secondlife, it is no longer used there.
LiruMouse Feb 25, 2020
6a2421e
Fix dumb build warning on windows
LiruMouse Feb 25, 2020
2aa3ba4
Fix crashes that were reported when using object right click menu
LiruMouse Feb 25, 2020
4f57498
Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
LiruMouse Feb 25, 2020
25cb812
Don't use clamp mode on av mesh.
Shyotl Feb 25, 2020
b08b597
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
LiruMouse Feb 25, 2020
bac0b3d
Update FMOD Studio to 2.00.07
LiruMouse Feb 25, 2020
2aa6adf
Pip, Squeak.
LiruMouse Feb 25, 2020
841a55c
Remove duplicate setText line that was failing anyway.
LiruMouse Feb 25, 2020
16b8980
Fix the new window inventory folder floater, and opt it to squeak!
LiruMouse Feb 25, 2020
a652cb4
Collaboration between myself and Router the Gray to Flinux
LiruMouse Feb 25, 2020
2fc2b7c
Sync some mime types with upstream, also remove erroneous 'video/libv…
RouterGray Feb 26, 2020
c72059e
[CMake CEF] How was this even working? Set dependencies and link tar…
RouterGray Feb 26, 2020
8f89127
[CEF] Catch a missed change for dullahan update. OCDly fix an indent…
RouterGray Feb 27, 2020
be07df3
[Lib] Update Linux dullahan
RouterGray Feb 27, 2020
9412f63
Object->Derender from Object UIs
LiruMouse Feb 28, 2020
1b742aa
Menu finals and overrides
LiruMouse Feb 29, 2020
72b5976
Merge to fix missing agent slurl handler for removefriend and (un)block
LiruMouse Feb 29, 2020
c2480d7
When muting an object via pie menu, select it in the mute floater
LiruMouse Feb 29, 2020
1a61c49
Display name change notifications that link to the user
LiruMouse Feb 29, 2020
9264482
Small patch to french translation, thanks Nomade
LiruMouse Feb 29, 2020
74a6f73
When possible, populate the owner id of our llviewerobjects
LiruMouse Feb 29, 2020
991d603
Don't copy around strings and UUIDs, LL... pls
LiruMouse Feb 29, 2020
68ceac3
llDialog & llTextBox with linked owner name and object name
LiruMouse Feb 29, 2020
e4eca07
Allow right clicking object UI labels to interact with their owners!
LiruMouse Feb 29, 2020
d6f320f
Clean up Object SLURL right click menu with a few submenus
LiruMouse Feb 29, 2020
e502b87
Ooops, forgot to save the rewrite of this that actually fixes it
LiruMouse Feb 29, 2020
c340dde
Speculative fixes.
Shyotl Mar 1, 2020
d8c4db1
Make gcc happy again..
Shyotl Mar 1, 2020
34f6ea4
Rework LLSurface[Patch]. Abuse weak_ptr for now. Rewrote connectNeigh…
Shyotl Mar 1, 2020
d2d172f
Allow oversized images when performing raw snapshots.
Shyotl Mar 1, 2020
b7086a9
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
LiruMouse Mar 1, 2020
ffa32f8
Fix linux compile
LiruMouse Mar 1, 2020
5d44552
Allow UI scale values as low as .5 to better meet HiDPI needs
LiruMouse Mar 1, 2020
9880fe2
[Linux] Use system libraries for dbus-glib, gtk-atk-pango-glib, and o…
RouterGray Feb 27, 2020
0a6a47a
[Linux] Use system X11.
RouterGray Mar 1, 2020
ecd52a9
[Cmake] Comment out unused llplugincookiestore.
RouterGray Mar 1, 2020
5071c1e
Merge remote-tracking branch 'github-liru/master' into NixTesting
RouterGray Mar 1, 2020
ef46d21
Final
LiruMouse Mar 4, 2020
7859c0a
Fix the ancient way of magic text box hack wherein multiple buttons w…
LiruMouse Mar 4, 2020
6e5eed7
Fix focus on Object Owners
LiruMouse Mar 4, 2020
dd61d47
Prevent use of outdated notecard import by removing it from LLTextEditor
LiruMouse Mar 5, 2020
506c6aa
Use INetC instead of NSISdl, thanks Rye!
LiruMouse Mar 10, 2020
1c46c26
Notifications with tooltips on buttons, for when text is too long!
LiruMouse Mar 10, 2020
9b7aa95
Fix unresolved links in caution notifications
LiruMouse Mar 10, 2020
9f82933
Reduce repeated follow pilot code
LiruMouse Mar 10, 2020
18fbac2
Correct comment in follow pilot code
LiruMouse Mar 10, 2020
8d564d6
Follow Pilot algorithm tweak: Fly if already flying or target is above
LiruMouse Mar 10, 2020
26976b7
Fixup minor use after free issues, and improper mutex usage in meshre…
Shyotl Mar 15, 2020
a294916
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl Mar 15, 2020
e5a6f1e
[CMake Linux] Fix my being too rushed in Copy3rdParty, restore openal
RouterGray Mar 16, 2020
4871f5e
AO Refactor
LiruMouse Mar 10, 2020
c7e0360
Fix constant reallocation of texture fetch command queue because...wh…
LiruMouse Mar 22, 2020
7509d92
Make everyone upset! Reorganize group notices!
LiruMouse Mar 22, 2020
7597ce3
Force Swim button for AO, for when you wanna swim above water
LiruMouse Mar 22, 2020
0511d59
erase iters properly, please
LiruMouse Mar 22, 2020
4602602
Link owner name in inventory offers from objects
LiruMouse Mar 22, 2020
a66c91b
Labels for agent slurls should use the default name system
LiruMouse Mar 22, 2020
a3d2107
Fix an oopsie woopsie, thanks bready doggy
LiruMouse Mar 22, 2020
0f6285b
Split up floaterao.* into aosystem.* and aostate.h, also further refa…
LiruMouse Mar 22, 2020
4e042db
Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
LiruMouse Mar 23, 2020
11d59d1
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
LiruMouse Mar 23, 2020
54b75a3
Add SinguOwnerSayAsErrors to make llOwnerSay spew to debug console in…
LiruMouse Mar 23, 2020
0704876
Comment out unused macros in llviewerregion.h
LiruMouse Mar 23, 2020
8c6e614
Fix accidental paste in aosystem init
LiruMouse Mar 23, 2020
a9b047b
Minor compile fixes: move a declaration out of a namespace, add an in…
RouterGray Mar 23, 2020
9522e38
Merge viewer-benefits
LiruMouse Mar 23, 2020
ee1baaf
Actually Delete LLView copy constructor
LiruMouse Mar 24, 2020
ac1ef4d
Hide temp upload on SL
LiruMouse Mar 24, 2020
55f9937
Fix looping over empty age strings on OpenSim, no longer retry on SL
LiruMouse Mar 24, 2020
c7448f2
Fix inverted logic for benefits on opensim
LiruMouse Mar 24, 2020
cf57624
Fix IsNearby check having invalid logic and hiding options because of it
LiruMouse Mar 25, 2020
7cab44a
Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
LiruMouse Mar 25, 2020
e91aac1
For science. Let's see if sentry.io accepts these annotations...
Shyotl Mar 26, 2020
4a237de
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl Mar 26, 2020
28e5270
All agent SLURLs should use the name system names, not just profile o…
LiruMouse Mar 26, 2020
89ce328
Fix script dialogs showing UI SLURLs when SinguReplaceLinks is false
LiruMouse Mar 27, 2020
731283a
Friendship accepted notifications as tips with linked names
LiruMouse Mar 27, 2020
45f4f60
nopaque
LiruMouse Mar 27, 2020
72d8b8f
Potentially harden against region teardown crash. Screw with branchin…
Shyotl Mar 27, 2020
4de8c3a
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl Mar 27, 2020
b21cc83
Clean up old Experience UI port code
LiruMouse Mar 28, 2020
407b527
[XPTools] Fix linux crash bug, make Cancel button close Experiences f…
LiruMouse Mar 29, 2020
74518f2
Merge remote-tracking branch 'github-liru/master'
RouterGray Mar 29, 2020
b10619e
[Linux] Don't strip binaries, even when building release, unless pack…
RouterGray Mar 29, 2020
a7e56d2
Fix an accident in a ternary.
RouterGray Mar 29, 2020
0b992fd
[Lib] Update nlohmann json and switch it to FetchContent instead of p…
RouterGray Mar 29, 2020
eeabbce
[Lib] Update abseil. (Alchemy sync)
RouterGray Mar 29, 2020
356d289
User request: Add last owner profile button to object inspect.
RouterGray Mar 29, 2020
c033d69
[Linux] More follow-through on earlier manifest tuning, make always r…
RouterGray Mar 30, 2020
919ffb3
[UI] Add missing 'AlreadyInGroup' to strings.xml
RouterGray Mar 30, 2020
347c2cb
Fall in line with LL octree code.
Shyotl Apr 1, 2020
6028ae7
Fix group notices: Have a background for the header for certain skins.
LiruMouse Apr 1, 2020
d04a8fc
Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
LiruMouse Apr 1, 2020
77f500c
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
LiruMouse Apr 1, 2020
e642e95
The sim is actually the region
LiruMouse Apr 1, 2020
98b42e8
Fix SV-2282: Incorrect terminology for TP Sound preference UI
LiruMouse Apr 1, 2020
9de6d76
A lot of updates and fixes for spanish language translations.
Apr 1, 2020
332cef0
Disable debug logging unless RelWithDeb
Shyotl Apr 2, 2020
3ab800d
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl Apr 2, 2020
4c7d222
Fix reverted xml change, fix formatting
LiruMouse Apr 2, 2020
ac3e19c
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
LiruMouse Apr 2, 2020
7b03103
April Fools!
LiruMouse Apr 2, 2020
c2fd886
Fix some remaining spanish translations.
Apr 2, 2020
321730e
More translations fixes in Area search and menu list owners.
Apr 2, 2020
3c36865
Update crashpad, thanks Rye!
LiruMouse Apr 3, 2020
cc034f6
Fix inventory scrolling issue when navigating via keyboard.
Shyotl Apr 3, 2020
445eb29
Bring aisapi handling closer to LL (code 499 retry, match timeout val…
Shyotl Apr 3, 2020
06698de
A couple more sim->region changes
LiruMouse Apr 3, 2020
f75ac3e
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl Apr 3, 2020
d9049ba
Handle AISAPI throttling and status 410 a bit better.
Shyotl Apr 3, 2020
4198f47
Fix header breakage in debug/relwithdebug
Shyotl Apr 3, 2020
1de6d44
Add missing EmergencyTeleportSeconds preference to System->Security
LiruMouse Apr 3, 2020
18f9f19
Textures mid-decode potentially processing of other textures until co…
Shyotl Apr 3, 2020
4fd3022
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl Apr 3, 2020
1daccf4
Move the FMOD Powered By text, for Torric and others
LiruMouse Apr 4, 2020
5040275
[CMake] Releases shouldn't speak Greek.
RouterGray Apr 4, 2020
0aa5e0b
Close 'default permissions' window on client disconnect. Nonfunctiona…
Shyotl Apr 5, 2020
23068a7
Select Mute when muting object via Object profile
LiruMouse Apr 6, 2020
79d938a
Sync LLMuteList code with upstream
LiruMouse Apr 7, 2020
b86eae0
Sync to fix using gMessageSystem when it may not have the right message
LiruMouse Apr 7, 2020
1361f9b
Simplify selection of mute
LiruMouse Apr 7, 2020
f9185e8
Fix mutelist popping up, I think
LiruMouse Apr 7, 2020
7e62d17
Don't try to use region if it's null for permissions defaults
LiruMouse Apr 7, 2020
ae17f76
Remove now unused LLIMInfo
LiruMouse Apr 7, 2020
c4af224
Update mesh export code, cause why not.
LiruMouse Apr 7, 2020
ae15dcb
Merge 41224c57317b6c1b44528aa1dc1f13732cdffe6d from viewer-lion... sorta
LiruMouse Apr 7, 2020
ed7f737
Potentially fix crash in LLSurface
Shyotl Apr 8, 2020
1189573
Fix mismatched tag
LiruMouse Apr 8, 2020
cbb7e47
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
LiruMouse Apr 8, 2020
6443849
Do not lookup strings in the toolbar per frame, ack!
LiruMouse Apr 8, 2020
718ef09
Fix removing/exporting picks when unable to add more
LiruMouse Apr 8, 2020
f36e8fb
Better crashdump context.
Shyotl Apr 8, 2020
8a16e6c
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl Apr 8, 2020
24331d3
Prefer LLPointer over potential for dangling LLSpatialGroup pointers.
Shyotl Apr 9, 2020
be3cbc6
Update current region debug string upon cap seed request. Carry over …
Shyotl Apr 9, 2020
b2c965e
Do not apply internal windlight parameter scaling on the sliders them…
Shyotl Apr 9, 2020
801bb8a
Compile fix, make types agree in terniary in octree. Thanks Liru.
RouterGray Apr 9, 2020
e6826a4
Fix 'is typing...' notifications never going away.
Shyotl Apr 10, 2020
1a86609
Copy Folder ID and Open Folder In New Window for ANY folder
LiruMouse Apr 10, 2020
c5f1ac8
Fix postcard sends, use cap for user info, stop using 'from' email as…
RouterGray Apr 10, 2020
7755f1e
Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
LiruMouse Apr 11, 2020
257086c
Revert texture fetching behavior back closer to v3.
Shyotl Apr 16, 2020
132db62
Make Debug configuration compile once more.
Shyotl Apr 16, 2020
9bffc4b
Attempt to squash spatial partition crash.
Shyotl Apr 16, 2020
af3c66a
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl Apr 16, 2020
c201ac9
Track log names in a json map AND Fix processing local log load as sy…
LiruMouse Apr 18, 2020
788b83b
Woops, thanks for catching this, Shyotl!
LiruMouse Apr 18, 2020
343be08
[Chat Logs] Break out migrateFile from makeLogFileName for use elsewhere
LiruMouse Apr 19, 2020
4df2193
[Chat Logs] Always read from name cache on start to try to update ID Map
LiruMouse Apr 19, 2020
33d3bb2
[Chat Logs] When migrating file to new name, respect possible new nam…
LiruMouse Apr 20, 2020
64ed6e9
Fix [NAME] appearing in certain i18n notifications instead of slurls
LiruMouse Apr 20, 2020
b02d70f
Merge stuff from future branch and a logic bug fix by Router
LiruMouse Apr 23, 2020
829045c
Haphazard unsigned to signed casts causing problems? Shocker.
Shyotl Apr 23, 2020
5de94d6
Address several remaining 1.8.9.8373 crashes reported on
Shyotl Apr 23, 2020
b4080f8
Demote this to llassert.
Shyotl Apr 23, 2020
3c3d8c2
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl Apr 23, 2020
a9dbaf5
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
LiruMouse Apr 24, 2020
159de68
Correct a logical OR in llrender, and add guards against mCount dropp…
RouterGray Apr 24, 2020
a69e04a
[Lib] Update Fmtlib, and enable it for Linux builds. This is bare bo…
RouterGray Apr 24, 2020
32dbd40
Unhack the string_view workaround in llpreviewgesture, with a slightl…
RouterGray Apr 26, 2020
61f90c6
Fix issue with persistent notifications. open_notifications.xml was a…
Shyotl May 9, 2020
bd92a09
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl May 9, 2020
cabaf0f
Don't use buildHTTP for login page, it might be https! Copy entire uri!
LiruMouse May 13, 2020
5e21037
Fix rare shutdown crash
Shyotl May 17, 2020
8817bf5
Fix loading of texture precache list.
Shyotl May 17, 2020
050a8c3
Use sse copy for vertex and texcoord data.
Shyotl May 17, 2020
ab5bce6
Merge branch 'master' of https://github.com/singularity-viewer/Singul…
Shyotl May 17, 2020
f941bc4
[RLVa] Lie about our version of the spec, for now, I'll fix this later
LiruMouse May 19, 2020
24f5457
Add setting to allow legacy UDP offline message fetch till LL fixes t…
RouterGray May 19, 2020
2bdcd9d
[Linux] Target SSE 4.1. (I will make custom builds if anyone on olde…
RouterGray May 19, 2020
68ae8af
[Lib] Update abseil and fmt.
RouterGray May 19, 2020
45be739
[Lib][Linux] Use system SDL not prebuilt.
RouterGray May 20, 2020
34a7ebf
[Linux] Port some bits from Alchemy & future to stop using dark-ages …
RouterGray May 20, 2020
3e78b74
Now that fmt plays nice with gcc let's actually use it: replace std::…
RouterGray May 20, 2020
518da73
Drop some unused boost lexical_cast includes and associated MSVC prag…
RouterGray May 21, 2020
ffb5480
[Media] Nuke unused llmime and associated build tests, also remove un…
RouterGray May 28, 2020
fe9d670
[Linux] Update the debugging instructions in the viewer launch script…
RouterGray Jun 5, 2020
81f342e
[Windows][Installer] Add CRC check, add 7z to plugin reserves, remove…
RouterGray May 28, 2020
881cc46
Add missing strings to floater_model_preview.xml
RouterGray Jun 7, 2020
5610eaa
[UI] Let the 'Dimensions' text on texture preview floaters be as wide…
RouterGray Jun 8, 2020
2528f71
[Media] Add https to allowed audio urls
RouterGray Jun 13, 2020
4efe28c
Merge in offline item deliveries fix from upstream. This also revert…
RouterGray Jul 2, 2020
386528a
Improved mesh model (DAE) loader compatibility
tarocco Sep 7, 2020
9f9a21b
refactor: reuse local variable
tarocco Sep 25, 2020
f9c07b4
only use SID if it is not empty
tarocco Sep 25, 2020
f0dfb0b
Update openjpeg with alchemy changes
RyeMutt Sep 29, 2020
997037a
Update fmodstudio to 2.0.04 build 417
RyeMutt Sep 30, 2020
04db5d1
Merge branch 'master' of https://github.com/RouterGray/SingularityVie…
RyeMutt Sep 30, 2020
891286c
Merge pull request #35 from tarocco/meshupload
RyeMutt Oct 1, 2020
4a0936a
Enable running master builds from web
RyeMutt Oct 1, 2020
937618b
Model-space transformations applied to skinned model and bind shape m…
tarocco Sep 18, 2020
c1aa88c
Fix bad VLC experience in installer. Thanks Rye~
LiruMouse Oct 8, 2020
d49c38b
Refactor LLDAELoader
tarocco Oct 9, 2020
246db97
These changes look harmless
LiruMouse Feb 14, 2021
8d2bdd4
New year, new gitlab-ci; thanks Rye!~
LiruMouse Feb 14, 2021
ae24498
Nope, this was broken, woops!~
LiruMouse Feb 14, 2021
dfcdb6b
Make gitlab ci work even if there's no linux build
LiruMouse Feb 14, 2021
33cdb8a
Make a function for trying to upload a platform's build
LiruMouse Feb 19, 2021
e6dc4d4
Don't forget to upload the 32-bit build!
LiruMouse Feb 19, 2021
ca7ea4a
Correctly use Python2
Oct 22, 2020
7709a27
Update FMOD
RyeMutt Oct 1, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 0 additions & 1 deletion .gitattributes

This file was deleted.

17 changes: 5 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,37 +1,30 @@
/installed.xml
/indra/llcommon/llversionviewer.h
/indra/build-*
/indra/tools/vstool/obj/
*.aps
*.suo
*.vshost.exe
*/.vs
/bin/
/bin-release/
/bin
/bin-release
/indra/out/
/indra/viewer-*
/indra/newview/vivox-runtime/
/indra/newview/dbghelp.dll
indra/newview/res/viewer_icon.*
indra/newview/res-sdl/viewer_icon.*
/libraries/
/lib/
*.pyc
*.orig
*.rej
*.bak
*~
*.DS_Store
/LICENSES/
/edited-files.txt
qtcreator-build/
/.pc
/build-*
/viewer-*
/indra/newview/res/viewerRes.rc
/indra/newview/res/viewerRes_bc.rc
/indra/newview/English.lproj/InfoPlist.strings
/indra/newview/linux_tools/handle_secondlifeprotocol.sh
/indra/newview/linux_tools/install.sh
/indra/newview/linux_tools/refresh_desktop_app_entry.sh
/indra/newview/linux_tools/wrapper.sh


/Pipfile.lock
286 changes: 286 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,286 @@
stages:
- build
- upload

default:
interruptible: true
timeout: 4h

variables:
AUTOBUILD_BUILD_ID: $CI_PIPELINE_ID
AUTOBUILD_INSTALLABLE_CACHE: "$CI_PROJECT_DIR/.cache/autobuild"
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
VIEWER_USE_CRASHPAD: "TRUE"
VIEWER_CRASHPAD_URL: $SENTRY_DSN

.win_build:
stage: build
tags:
- autobuild
- windows
cache:
key:
files:
- autobuild.xml
prefix: ${CI_JOB_NAME}
paths:
- .cache/autobuild
- .cache/pip
- .venv/
when: 'always'
before_script:
- virtualenv .venv
- .\.venv\Scripts\activate.ps1
- pip install --upgrade autobuild -i https://pkg.alchemyviewer.org/repository/autobuild/simple --extra-index-url https://pypi.org/simple
script:
- |
autobuild configure -c Release -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DREVISION_FROM_VCS=FALSE
autobuild build -c Release --no-configure
artifacts:
name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
expire_in: 1 week
paths:
- build-vc-*/newview/Release/build_data.json
- build-vc-*/newview/Release/singularity-bin.exe
- build-vc-*/newview/Release/*.pdb
- build-vc-*/newview/Release/*.dll
- build-vc-*/newview/Release/Singularity_*_Setup.exe

.linux_build:
stage: build
image: r.alchemyviewer.org/singularity/infrastructure/debian-build-image:latest
tags:
- linux
- docker
cache:
key:
files:
- autobuild.xml
prefix: ${CI_JOB_NAME}
paths:
- .cache/autobuild
- .cache/pip
- .venv
when: 'always'
before_script:
- virtualenv .venv -p python2
- source .venv/bin/activate
- pip install --upgrade autobuild -i https://pkg.alchemyviewer.org/repository/autobuild/simple --extra-index-url https://pypi.org/simple
script:
- |
autobuild configure -c Release -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DUNIX_DISABLE_FATAL_WARNINGS=ON -DREVISION_FROM_VCS=FALSE
autobuild build -c Release --no-configure
artifacts:
name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
expire_in: 1 week
paths:
- build-linux-*/build_data.json
- build-linux-*/newview/Singularity_*.tar.xz

.win32_build:
extends: .win_build
variables:
AUTOBUILD_ADDRSIZE: 32
VIEWER_USE_CRASHPAD: "FALSE"
cache:
key:
prefix: windows32

.win64_build:
extends: .win_build
variables:
AUTOBUILD_ADDRSIZE: 64
cache:
key:
prefix: windows64

.linux32_build:
extends: .linux_build
variables:
AUTOBUILD_ADDRSIZE: 32
cache:
key:
prefix: linux32

.linux64_build:
extends: .linux_build
variables:
AUTOBUILD_ADDRSIZE: 64
cache:
key:
prefix: linux64

.master_rules:
rules:
- if: $BUILD_CHANNEL || $CI_COMMIT_TAG
when: never
- if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_PIPELINE_SOURCE == "schedule"'
#- if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "push"'
# when: delayed
# start_in: '12 hours'
variables:
VIEWER_CHANNEL_TYPE: Test
VIEWER_USE_CRASHPAD: "FALSE"

.project_rules:
rules:
- if: '$BUILD_CHANNEL == "Project" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
- if: '$CI_COMMIT_TAG =~ /.*-project/'
variables:
VIEWER_CHANNEL_TYPE: Project

.beta_rules:
rules:
- if: '$BUILD_CHANNEL == "Beta" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
- if: '$CI_COMMIT_TAG =~ /.*-beta/'
variables:
VIEWER_CHANNEL_TYPE: Beta

.release_rules:
rules:
- if: '$BUILD_CHANNEL == "Release" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
- if: '$CI_COMMIT_TAG =~ /.*-release/'
variables:
VIEWER_CHANNEL_TYPE: Release

.build:master:linux64:
extends:
- .linux64_build
- .master_rules

build:master:windows32:
extends:
- .win32_build
- .master_rules

build:master:windows64:
extends:
- .win64_build
- .master_rules

.build:project:linux64:
extends:
- .linux64_build
- .project_rules

build:project:windows32:
extends:
- .win32_build
- .project_rules

build:project:windows64:
extends:
- .win64_build
- .project_rules

.build:beta:linux64:
extends:
- .linux64_build
- .beta_rules

build:beta:windows32:
extends:
- .win32_build
- .beta_rules

build:beta:windows64:
extends:
- .win64_build
- .beta_rules

.build:release:linux64:
extends:
- .linux64_build
- .release_rules

build:release:windows32:
extends:
- .win32_build
- .release_rules

build:release:windows64:
extends:
- .win64_build
- .release_rules

.upload_template:
stage: upload
tags:
- autobuild
- windows
allow_failure: false
script:
- |
$BuildData = Get-Content .\build-vc-64\newview\Release\build_data.json | ConvertFrom-Json
$BuildChannelVersion = $BuildData."Channel" + ' ' + $BuildData."Version"
$UploadDestViewerDir = $BuildChannelVersion.ToLower().Replace(" ", "/")
$UploadDestURL = "https://pkg.alchemyviewer.org/repository/viewer/${UploadDestViewerDir}"

$UploadParams = @{ UseBasicParsing = $true;
Method = "PUT";
Headers = @{
ContentType = "application/x-executable";
Authorization = "Basic $([System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes("$env:AUTOBUILD_HTTP_USER`:$env:AUTOBUILD_HTTP_PASS")))"; };
Verbose = $true; };

Function try_upload($build_type, $file_pattern)
{
$build_newview = ".\build-${build_type}\newview\"
If (Test-Path -LiteralPath $build_newview)
{
Push-Location $build_newview
$FileName = Get-ChildItem -Path . -Name -Include $file_pattern
Invoke-WebRequest @UploadParams -InFile .\$FileName -Uri "${UploadDestURL}/${FileName}"

If (($env:VIEWER_USE_CRASHPAD -eq 'TRUE') -and ($build_type -eq "vc-64"))
{
sentry-cli upload-dif --include-sources singularity-bin.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1.dll libcrypto-1_1.pdb libssl-1_1.dll libssl-1_1.pdb libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll libhunspell.dll libhunspell.pdb glod.dll
}
Pop-Location
}
}

try_upload("linux-64", "Singularity_*.tar.xz")
try_upload("vc-64", "Singularity_*_Setup.exe")
try_upload("vc-32", "Singularity_*_Setup.exe")

If ($env:VIEWER_USE_CRASHPAD -eq 'TRUE')
{
sentry-cli releases new $BuildChannelVersion
sentry-cli releases set-commits --auto $BuildChannelVersion
sentry-cli releases finalize $BuildChannelVersion
}

upload:project:
extends:
- .upload_template
rules:
- if: '$BUILD_CHANNEL == "Project" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
when: manual
- if: '$CI_COMMIT_TAG =~ /.*-project/'
when: manual
environment:
name: qa

upload:beta:
extends:
- .upload_template
rules:
- if: '$BUILD_CHANNEL == "Beta" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
when: manual
- if: '$CI_COMMIT_TAG =~ /.*-beta/'
when: manual
environment:
name: beta

upload:release:
extends:
- .upload_template
rules:
- if: '$BUILD_CHANNEL == "Release" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
when: manual
- if: '$CI_COMMIT_TAG =~ /.*-release/'
when: manual
environment:
name: release
Loading