Commit Graph

57968 Commits (fe37eb66ef31504caee4f6445dc2f2142c0e7d60)

Author SHA1 Message Date
Ansariel fe37eb66ef FIRE-29244: Chat keywords don't work properly if keyword list contains whitespaces for readability; based on a patch by Testicular Slingshot 2020-01-25 10:23:32 +01:00
Ansariel 83a9e1d450 FIRE-8257: Text in chat console is sometimes cut off on the left side; based on a fix by Testicular Slingshot 2020-01-25 01:23:58 +01:00
Ansariel ef4ac63542 Update FMOD Studio to 2.00.07 on Windows 2020-01-24 10:34:52 +01:00
Ansariel 48d2b79203 FIRE-29194: <nolink> tags showing in offline inventory offer log 2020-01-24 09:40:34 +01:00
Ansariel 3b0e60c5f8 More line ending normalization madness 2020-01-16 09:35:33 +01:00
Ansariel 32bf723405 Now let's see what Git is complaining in VS... 2020-01-16 01:24:05 +01:00
Ansariel 874144b6be Thanks for screwing this up, Git! 2020-01-16 01:21:04 +01:00
Ansariel 9225b7a753 Line ending normalization 2020-01-16 01:07:18 +01:00
Ansariel 552e6793fc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-01-16 00:47:23 +01:00
Ansariel f2979d46c0 Add TTF to .gitattributes 2020-01-16 00:47:12 +01:00
Ansariel 9cb7b7eded Fix typos in German translation 2020-01-16 00:42:56 +01:00
Jay Maynard 6316e6a41c Allow signing that actually works for Catalina post-1/1/2020. 2020-01-14 18:25:59 -06:00
Beq c93fac05be Merge branch 'BOMforOS' 2020-01-11 21:16:58 +00:00
Beq 39d59396d9 BOM for OS
replace static LLVOAvatar sMaxBakes with region based maxBakes()
Add additional guard on skirt rendering
member varts mMaxBakes and mMaxTEs on voregion
OPENSIM only drive maxBakes/TEs from Sim features
move rebake required detection out of voavatar, to avatartself
ADDITIONAL: prevent sending of skirt bake when not required
2020-01-11 21:12:10 +00:00
andreykproductengine cac841421e SL-12505 Projectros fix 2020-01-08 18:18:51 +01:00
Ansariel f29362298c Replace .gitignore with merged LL version 2020-01-08 18:04:40 +01:00
Ansariel 8dac576e3c Update crash report translations for other languages as well 2020-01-05 21:46:41 +01:00
Nicky Dasmijn 2940ea19c0 Merge remote-tracking branch 'origin/master' into bugsplat 2020-01-04 23:37:41 +01:00
Nicky Dasmijn fcd54589ca BugSplat is not available for OSX or Linux right now. 2020-01-04 23:24:01 +01:00
Nicky Dasmijn a45d3e8bee Add build_data.json into pdb tarball, this will allow easier bugsplat
upload.
2020-01-04 23:23:19 +01:00
Nicky Dasmijn 1bcbf82734 Remove option of minidump type.
- With Bugsplat this option makes no sense.
- Even with the old minidump processor the option was barely useful.
2020-01-04 22:27:22 +01:00
Nicky Dasmijn 09de24bf1d When using Bugspluat there is no way to ask before uploading a crash,
disable that option.
2020-01-04 14:27:56 +01:00
Nicky Dasmijn 2e2c08676a Bugsplat tweaks for Firestorm (Windows). 2020-01-03 23:30:37 +01:00
Ansariel 0015cfae78 Guard against null-pointer crash 2020-01-02 11:30:33 +01:00
Ansariel 6b9aebb105 FIRE-29253: Allow multi-selection for all name lists in group profile 2020-01-02 11:03:10 +01:00
Nat Goodspeed 542099e9c9 Import from vs2017 brach:
commit d5a7ba6ce7
Author: Nat Goodspeed <nat@lindenlab.com>
Date:   Tue Oct 22 12:20:21 2019 -0400

    DRTVWR-476: Update to bugsplat build 532004
2020-01-01 20:05:11 +01:00
Ansariel ce6d5ade51 It's 2020... 2020-01-01 13:48:19 +01:00
Ansariel 153ae40aa6 Probably best to move VSTool wildcard further up 2019-12-31 11:36:35 +01:00
Ansariel 16f24f8373 Make sure every file has LF line ending apart from some exceptions 2019-12-30 19:34:04 +01:00
Ansariel 4fa92819c9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2019-12-30 18:47:48 +01:00
Ansariel 819c1f607a Don't add physics layer - always replace 2019-12-30 18:47:36 +01:00
Nicky f238377c80 Bake git rev. hash into the viewer. 2019-12-29 23:27:02 +01:00
Nicky 7c9e7f4c03 Ignore *.orig files. 2019-12-29 20:56:12 +01:00
Nicky 8e951446f7 Don't e "helpful" and auto convert shell scripts from unix to dos. 2019-12-29 20:54:54 +01:00
Nicky 011bdba647 Linux; Set -fno-var-tracking-assignments for compilation of llviewermenu.cpp to squelch warning about gcc running out of memory and recompiling the file without that option anyway. 2019-12-26 23:34:01 +01:00
Nicky 8e877cc02a Linux; Disable ndof_dump to be able to use built 3ps between vs2017 and non vs2017 branches. 2019-12-26 02:14:45 +01:00
Beq 2e809a6a92 Bool is not an allowed type in Settings 2019-12-25 23:37:08 +00:00
Beq 03eb842b40 Make the rebake explicitly OpenSim.
Tracking needs to persist for SL->OS use case
2019-12-23 14:22:41 +00:00
Beq 315e0f6dae Force a rebake on region upd if BOM support changes
Persists last grid BOM support to force rebake across logins,
hopefully this removes the black bakes
2019-12-23 10:56:01 +00:00
Beq cde80582c5 ignore my_autobuild.xml and .vscode detritus 2019-12-22 12:56:40 +00:00
Ansariel ac5817fed1 Make obsolete Merchant Outbox folder deletable 2019-12-18 18:58:00 +01:00
Ansariel 85a83a90f6 Remove .hgtags file 2019-12-16 14:06:18 +01:00
Ansariel f7783ca561 Fix unable to copy&paste into outfits anymore 2019-12-16 14:05:55 +01:00
Ansariel 0f7a3f9147 Merge branch 'fslgpl-hg' 2019-12-14 23:25:13 +01:00
PanteraPolnocy 10627a2fad Updated Polish translaton 2019-12-14 19:43:20 +01:00
Ansariel d12c9550e9 Let's just go with revcount since we're going to build from tip anyway where it matters (this should be ok for LGPL and release repo) 2019-12-14 17:02:34 +01:00
Ansariel c1a06438ba Transition from .hgignore to .gitignore 2019-12-14 16:51:05 +01:00
Nicky c1152886f7 Prepare for git:
- When configured from a git directory (crudely detected by testring for .git/ existance) use AUTOBUILD_BUILD_ID for the revision.
- Oterwise use the locale mercurial change number (as before).
2019-12-14 10:53:00 +01:00
Nicky 476f71f6ce Correct for nonsensical if clause. 2019-12-12 22:57:06 +01:00
Ansariel a53f9f1e26 Make this an S32 as well 2019-12-12 21:08:55 +01:00