cbf1b9a036
Merge #1 with lgpl.
2017-02-06 11:57:44 +01:00
16aa95b0c6
Windows; Make autobuild build and clean work again.
2017-02-05 21:05:04 +01:00
140c0dcd63
Include json headers via json/ path.
2017-02-03 17:12:07 +01:00
fcd11b1c1e
Intialize variables, or GCC complains they might be used w/o initialization.
2017-02-03 16:09:09 +01:00
45ecc629c6
Just a little x64 fix.
2017-02-03 16:08:18 +01:00
c6af775566
Linux; All the needed link libraries for GTK
2017-02-03 16:07:49 +01:00
798192f395
Linuxl Do not add -DLL_OS_DRAGDROP_ENABLED=0 to the compiler flags. It already gets added in the variables file (and is set to 1 there, while the DragDrop.cmake set it to 0, this will need some testing if it should be 0 or 1).
2017-02-03 16:07:01 +01:00
280f713ffa
Linux64; Use autobuild packages that actually work and are 64 bit versions (the ones from LL are a mishmash of x86 and plain not working ones).
2017-02-03 16:04:59 +01:00
fc9874f00d
Merge a bunch of rendering fixes from Drake Arconis (Alchemy Viewer)
2017-01-18 11:15:54 +01:00
5aa14b9a4d
Add Firestorm tags & stuff
2017-01-18 11:13:08 +01:00
d9a2970015
We do not use Berkely DB.
2017-01-16 17:03:42 +01:00
2da2f31d4e
Linux: Use separate build directories for 32 and 64 bit builds.
2017-01-16 16:35:55 +01:00
0c6e79a61d
Do not add include/json/, include/jsconcpp/ directly into the include path, rather clients have to include like "json/reader.h". This is necessary as those directories contain a file features.h, which also under Linux is a system header. This will lead GCC to pick up the wrong features.h (the one from json).
2017-01-16 16:06:11 +01:00
1fc1cbd7d6
Linux: Do not copy libopenjpeg.so
2017-01-16 16:03:02 +01:00
bcd75a538e
Workaround for distributions who already define _FORTIFY_SOURCE by default (eg Gentoo) and do not redefine it then.
2017-01-16 15:54:24 +01:00
2b8a91b1c0
Remove gio-2.0, pangocairo-1.0 and ffi from required UI libs (at least for now. They are missing from the LL 3P, but might be required later on).
2017-01-16 15:53:29 +01:00
54ddddcaa3
Updatellceflib and fontconfig to match 3P usage between packages and viewer build.
2017-01-16 15:47:42 +01:00
481c141ce6
FIRE-20725: Import of custom spellcheck dictionary doesn't work
2017-01-13 19:04:29 +01:00
688bf1e547
Synchronize with viewer64 source.
2017-01-11 15:36:33 +01:00
0dca87fcde
Re-Add FS-64 bit packages we need.
2017-01-11 15:35:18 +01:00
19112a457a
Updated Polish translation
2017-01-11 14:15:05 +01:00
de78dbf671
Post merge sweep.
2017-01-11 02:25:05 +01:00
29543e2572
Remove obsolete code.
2017-01-11 02:24:51 +01:00
966c1f36c5
Fix compile error, KDU_X86_INTRINSICS was defined multiple times.
2017-01-11 00:33:20 +01:00
33ffda3af8
Point KDU/FMODEX to our versions.
2017-01-11 00:32:41 +01:00
5b4bc0be79
package_override files are finally history.
2017-01-10 19:36:35 +01:00
9797aecc90
Remove AVX configurations. Those will likely have to come back through the new build-variables.
2017-01-10 19:35:28 +01:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
adf4a26b15
Properly initialize LLVivoxVoiceClient::mHidden
2017-01-10 18:26:38 +01:00
e8869cefdb
Drake says passing a const reference into a coroutine is bad...
2017-01-10 13:10:13 +01:00
0f1891b661
Comment out logspam
2017-01-10 10:24:09 +01:00
2f756e3d26
FIRE-17834: Unscrew MAINT-2579 fix and apply the change only for those toasts it's necessary for
2017-01-10 10:23:09 +01:00
825351b445
Update German translation
2017-01-10 09:39:21 +01:00
9721651b9f
Add position & data display option to teleport history gear menu
2017-01-10 09:39:10 +01:00
d35b84bf38
Remove unnecessary cached control
2017-01-10 09:38:38 +01:00
797243378c
Merge
2017-01-09 23:30:31 +00:00
3e55272224
FIRE-20693: Get rid of visited landmark icon that hasnn't been working anymore for ages
2017-01-09 09:37:42 +01:00
d017b32c5f
Merge from lgpl
2017-01-09 00:27:01 +00:00
8be7e412ef
Support for Timezone switching in Teleport History
...
- Added FSTPHistoryTZ variable
- overrides the utc variable in datetime setting.
- Adds menu to LLTEleportHistoryPanel gear menu
- modifies behaviour of LLTeleportHistoryPanel::getNextTab to use TZ watersheds
2017-01-09 00:22:32 +00:00
f40bd0fac3
DRTVWR-418, SL-619: Update to google_breakpad build 501824
...
and re-enable breakpad symbol generation.
2017-01-06 17:03:35 -05:00
3f5f5ea58a
FIRE-20655: Don't try to add illegal characters to persisted notifications filename
2017-01-06 10:10:12 +01:00
8fd912a98f
And suddenly, completely on surprise, there is 2017...
2017-01-06 09:42:45 +01:00
eab6e009d0
Don't try to use LSL bridge if we don't have a URL and log URL request failures
2017-01-06 09:32:25 +01:00
1fe8d04a46
DRTVWR-418, MAINT-7038: Don't add double quotes to channel name.
...
The CMake directive that passes VIEWER_CHANNEL to the C++ compiler as
LL_VIEWER_CHANNEL was enclosing the VIEWER_CHANNEL value in double quotes. At
this point in history, those double quotes literally become part of the
LL_VIEWER_CHANNEL value, causing the viewer to construct a bad Viewer Version
Manager query containing those double quotes. Removing them fixes the query.
2017-01-05 18:49:56 -05:00
b0da6275f7
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2017-01-04 17:06:00 -05:00
85438e6725
DRTVWR-418: Fix line-break problem; also explicitly request bash.
2017-01-04 15:27:31 -05:00
0529000452
DRTVWR-418: Set signing CMake switches in build.sh for proper quoting.
2017-01-04 14:15:54 -05:00
24d2c4ae48
DRTVWR-418: Harmless change to kick TeamCity build.
2017-01-04 12:04:33 -05:00
8b4022f041
DRTVWR-418: Consume autobuild_configure_parameters in build.sh.
2017-01-04 09:27:36 -05:00
3b62401cf5
DRTVWR-418: Remove -DENABLE_SIGNING and -DSIGNING_IDENTITY
...
from autobuild.xml's darwin64 Release and ReleaseOS build (xcodebuild)
command.
-D passed to xcodebuild does NOT set CMake variables. These switches, in this
place, have never worked as intended.
2017-01-03 15:54:37 -05:00
Nicky