86bd3ffa47
pick up latest fixes from nat
2016-12-06 17:33:23 -05:00
0d4f1adc1e
merge fix for test runner failure
2016-12-06 16:31:07 -05:00
40b1913af3
DRTVWR-418: Fix minor error in forwarding shutdown_request() call.
2016-12-06 16:20:43 -05:00
4aae3e8eb4
DRTVWR-418: Try harder to ignore errors in llcorehttp's dummy server.
2016-12-06 16:07:05 -05:00
adf74f8ced
merge skip of llcorehttp failing test
2016-12-06 14:58:06 -05:00
8948c4f001
DRTVWR-418: Skip the llcorehttp test that breaks test machinery.
...
Loath though I am to skip testing, this consistent failure is not a failure in
the software being tested (llcorehttp) but rather in the dummy server with
which we're testing it.
2016-12-06 14:22:42 -05:00
199d3c5675
DRTVWR-418: Run packages-formatter via Python interpreter for Windows.
2016-12-06 13:25:53 -05:00
59f2055c8d
merge changes for latest fixes from nat
2016-12-06 12:22:55 -05:00
780120dc46
DRTVWR-418: Remove ThreadingMixin from our HTTPServer subclass.
...
It's possible that raising an exception in a worker thread -- even though
we're TRYING to suppress it -- is what's causing the process to terminate with
nonzero rc.
2016-12-06 12:19:01 -05:00
bae76ec8df
DRTVWR-418: Set AUTOBUILD_ADDRSIZE for packages-formatter.py.
...
This handles the case of building within an IDE, in which AUTOBUILD_ADDRSIZE
isn't already set.
2016-12-06 11:48:43 -05:00
e6b9174bba
DRTVWR-418: Try to clean up numerous CMake CMP0046 warnings.
2016-12-06 09:50:05 -05:00
e9a9e3d4ba
DRTVWR-418: Try for more llcorehttp tests error diagnostics.
2016-12-06 09:32:36 -05:00
295a4c63b4
merge changes for 5.0.0-release
2016-12-05 17:40:04 -05:00
2d8ad89f33
suppress VS linker warning about unfound pdb files in media plugin
2016-12-05 17:32:38 -05:00
05d58c91ef
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-12-05 17:01:38 -05:00
8a67aaa009
limit variants to RelWithDebInfo and Release
2016-12-05 15:20:08 -05:00
68413474c4
increment viewer version to 5.0.1
2016-12-05 14:16:56 -05:00
a9758daa34
Added tag 5.0.0-release for changeset b41e1e7c7876
2016-12-05 14:16:55 -05:00
83209ef5c0
remove more bits of the old build system
2016-12-05 13:28:40 -05:00
911cd64e60
lower the verbosity of makensis to emit only warnings and errors
2016-12-05 13:00:50 -05:00
b5f4af3263
suppress VS linker warning about unfound pdb files
2016-12-05 12:49:14 -05:00
8a12a4c967
merge callum fixes
2016-12-05 11:42:28 -05:00
4ca084f7a0
DRTVWR-418: Another round (hopefully the last) of fixing $variables.
2016-12-05 10:49:47 -05:00
fad899fe6c
correct merge duplications, put source_environment commands into sections
2016-12-05 10:14:18 -05:00
16266bedd1
merge sling-buildscripts updates
2016-12-05 10:04:15 -05:00
ea11d577c1
call standard initialization functions from buildscripts build.sh
2016-12-03 10:49:43 -05:00
cda19375cb
Pull in the new Havok source package that pulls includes the new Havok Libs package with corrected Win64 libs that are properly built for VS2013
2016-12-02 16:52:24 -08:00
40dd1e637a
Pull in fixed FMODEX package with 64 bit fmodex DLL correctly named (fmodex64.dll vs fmodex.dll)
2016-12-02 16:39:29 -08:00
3d37848d01
Remove winmmshim 'hack' from project and set volume directly from CEF media plugin using Windows system call. WinMMShim was only needed for XP systems and since we no longer support XP, it is not required.
2016-12-02 16:19:34 -08:00
ff6369f5a7
show the build address size in the About box
2016-12-02 15:53:41 -05:00
3a8aa2d13d
add viewer channel and version to the beginning of the About box Licenses information
2016-12-02 10:59:06 -05:00
8a461c00f4
DRTVWR-418: Until we figure out how to say FIXED:NO to linker, don't.
...
The present CMake logic wants to pass FIXED:NO to the linker for 64-bit
builds, which on the face of it seems like a Good Thing: it permits code to be
relocated in memory, preventing collisions if two libraries happen to want to
load into overlapping address ranges.
However the way it's being specified is wrong and harmful. Passing /FIXED:NO
to the compiler command line engages /FI (Forced Include!) of a nonexistent
file XED:NO -- producing lots of baffling fatal compile errors.
Thanks Callum for diagnosing this!
2016-12-01 08:50:10 -05:00
68d98acb92
DRTVWR-418: In 64 bits, storing size_t in an int is a no-no.
2016-12-01 08:44:52 -05:00
222919be87
DRTVWR-418: Adjust for LL_VIEWER_CHANNEL coming in unquoted.
...
Evidently the LL_VIEWER_CHANNEL macro (defined on the compiler command line)
used to contain enclosing double quotes. Something changed (newer CMake
version?) so that the macro now expands as Second Life Release rather than as
"Second Life Release". That leads to syntax errors when it's used.
Add C++ preprocessor trickery to stringize the value of the macro.
2016-11-30 20:10:28 -05:00
a47e16b316
DRTVWR-418: Flesh out the set of Platform_arch_Manifest classes.
2016-11-30 16:48:38 -05:00
d4b23ccb8a
DRTVWR-418: VertexMap::mapped_type -> size_t: we store map.size().
2016-11-30 16:24:32 -05:00
55ce854a0c
DRTVWR-418: Once again, undo inappropriate autobuild.xml expansions.
2016-11-30 16:18:01 -05:00
f9d9294419
DRTVWR-418: Merge Callum's KDU update
2016-11-30 16:15:58 -05:00
7e8e86dc21
DRTVWR-418: Update to KDU build 501106.
2016-11-30 16:08:32 -05:00
7b2cf53f78
Pull in new version of KDU third party package that is build (correctly) as a static library vs. a stub library/DLL
2016-11-30 12:21:05 -08:00
93db7eacbd
SL-540 - fix for regression in handling of out-of-range joint indices in skin weights
2016-11-30 14:03:54 -05:00
1c8d5457e8
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2016-11-30 13:55:02 -05:00
5bea9b6985
DRTVWR-418: Update llceflib to build 501109.
2016-11-30 13:54:49 -05:00
e61320921a
DRTVWR-418: Update forwarding_api.cpp to match current API signature
...
Specifically, DriverCallback() was accepting several DWORD arguments that
should really be DWORD_PTR arguments. In a 32-bit compile, evidently that was
okay, but for 64 bits they're different sizes.
2016-11-30 11:30:44 -05:00
05fb9468d0
DRTVWR-418: Address yet another effect of downdating openjpeg.
2016-11-29 21:18:58 -05:00
a2067761bb
DRTVWR-418: Revert unintentional expansion of $vars in autobuild.xml.
2016-11-29 17:31:47 -05:00
c5e6a960fb
DRTVWR-418: Update to openjpeg build 501102
2016-11-29 16:43:57 -05:00
809c0575bc
DRTVWR-418: Add viewer-build-variables to BuildParams
2016-11-29 16:22:06 -05:00
4d859d58bb
DRTVWR-418: Rename darwin platform to darwin64.
...
We never intend to support 32-bit Mac builds any more.
This change eliminates the autobuild warning about not finding darwin64 and
therefore falling back on plain darwin.
2016-11-29 16:19:46 -05:00
6979fc5667
DRTVWR-418: Revert one more openjp2.dll reference to openjpeg.dll.
2016-11-28 15:45:58 -05:00
Oz Linden