16f24f8373
Make sure every file has LF line ending apart from some exceptions
2019-12-30 19:34:04 +01:00
4fa92819c9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2019-12-30 18:47:48 +01:00
819c1f607a
Don't add physics layer - always replace
2019-12-30 18:47:36 +01:00
f238377c80
Bake git rev. hash into the viewer.
2019-12-29 23:27:02 +01:00
7c9e7f4c03
Ignore *.orig files.
2019-12-29 20:56:12 +01:00
8e951446f7
Don't e "helpful" and auto convert shell scripts from unix to dos.
2019-12-29 20:54:54 +01:00
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
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
71f15d6b20
Merge viewer-serval
2019-12-26 01:09:26 +01:00
2e809a6a92
Bool is not an allowed type in Settings
2019-12-25 23:37:08 +00:00
03eb842b40
Make the rebake explicitly OpenSim.
...
Tracking needs to persist for SL->OS use case
2019-12-23 14:22:41 +00:00
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
cde80582c5
ignore my_autobuild.xml and .vscode detritus
2019-12-22 12:56:40 +00:00
b006dc4639
SL-12485 The 'Sign up' button is cropped in some languages
2019-12-19 22:43:41 +02:00
787db9affc
SL-209 Removed obsolete localization files
2019-12-19 22:25:33 +02:00
a4d1af489f
SL-11315 Updated labels and notification
2019-12-19 20:05:38 +02:00
ac5817fed1
Make obsolete Merchant Outbox folder deletable
2019-12-18 18:58:00 +01:00
85a83a90f6
Remove .hgtags file
2019-12-16 14:06:18 +01:00
f7783ca561
Fix unable to copy&paste into outfits anymore
2019-12-16 14:05:55 +01:00
f421283caa
Merge Firestorm LGPL
2019-12-15 15:01:13 +01:00
0f7a3f9147
Merge branch 'fslgpl-hg'
2019-12-14 23:25:13 +01:00
10627a2fad
Updated Polish translaton
2019-12-14 19:43:20 +01:00
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
c1a06438ba
Transition from .hgignore to .gitignore
2019-12-14 16:51:05 +01:00
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
309c3571ca
Merge Firestorm LGPL
2019-12-14 00:06:42 +01:00
476f71f6ce
Correct for nonsensical if clause.
2019-12-12 22:57:06 +01:00
a53f9f1e26
Make this an S32 as well
2019-12-12 21:08:55 +01:00
e29018fa8c
Merge LL viewer-release 6.3.5
2019-12-12 19:50:45 +01:00
8afa4331e0
Merge Firestorm LGPL
2019-12-12 19:48:36 +01:00
433287cd44
Merged in lindenlab/viewer-release
2019-12-12 20:26:47 +02:00
d656d49a77
increment viewer version to 6.3.6
2019-12-12 13:15:52 -05:00
a231a86952
Added tag 6.3.5-release for changeset 27ca5834bfe9
2019-12-12 13:15:52 -05:00
b665a7a25d
Replicate latest grids.xml update to viewer repo (OS Conference regions)
2019-12-12 14:36:34 +00:00
7c91afb7a9
FIRE-22912 Group send fail on OpenSim
2019-12-12 13:33:03 +00:00
aa9348f3d4
FIRE-23591 Apply Patch from Kevin Cozens. OpenSim improved Map matches
...
(minor improvements on SL - see https://jira.secondlife.com/browse/BUG-228002 )
2019-12-11 14:15:14 +00:00
9ff18d9bbd
S32 instead of int
2019-12-10 17:44:57 +01:00
39617f8608
FIRE-29204 BoM fallback safety measures to protect legacy OpenSim.
...
limits bakes sent to the server depending on detected BOM capability.
initial tests on current OS tip and pre-BoM 0.9, needs more tests on other vers
2019-12-10 13:44:32 +00:00
5469b246d2
Compile time compatibility for KDU 8
2019-12-09 22:06:14 +01:00
b934806d86
Bugsplat; Guard against region not set (can happen during TP?).
2019-12-09 19:21:23 +01:00
a88700cdc2
LLVOVolume::markDead can be called with objects not having a volme set (yet). Make sure to not crash on that.
2019-12-07 19:09:35 +01:00
197ca8e979
Make sure the AO interface doesn't stay blank when already open on login - FIRE-29192
2019-12-05 02:19:19 +01:00
a7c0cd70b5
Updated Polish translation
2019-12-04 18:30:17 +01:00
295073286a
Update grids.xml for new OpenSim grid additions
2019-12-04 14:56:54 +00:00
d7aff68e6c
FIRE-29082: Adjust help wiki topic for avatar scripts floater
2019-12-03 22:47:19 +01:00
6bb65a4c6a
Make utility bar hide with all other UI parts when alt+shift+u is pressed - FIRE-29188
2019-12-02 22:40:34 +01:00
589fc9c7e5
Add missing localized floater header for outfit picture texture picker
2019-12-01 16:52:40 +01:00
149684719f
Merge viewer-lynx
2019-11-28 19:01:27 +01:00
bb95a21ebf
Merge
2019-11-28 18:50:36 +01:00
797fa6718b
Merge 494-maint-wassail
2019-11-28 17:09:26 +01:00
Ansariel