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
84c546182c
Backed out changeset: ffffbe002ff2
...
Finally reverting the MAINT-4488 (see BUG-37693 for details)
2016-12-05 19:21:11 +02: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
0eeb9c87e8
Merged in MAINT-6562
2016-12-02 12:43:26 +00: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
4daba484b0
MAINT-6974 FIXED '[ERROR_MESSAGE]' dialog is shown if try to bulk apload any .txt file
2016-12-01 15:31:39 +02:00
bd411d4503
MAINT-6562 Avatar COF was occasionally failing to update because Not Found
2016-12-01 13:58:24 +02:00
95826232bc
Ignore plugin warnings on linux
2016-12-01 12:18:35 +02: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
00bb6a5ecd
MAINT-6803 Account for deselection
2016-11-30 21:25:06 +02: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
caa0e333ed
MAINT-6970 FIXED Crash in LLFloaterPermsDefault::updateCap()
2016-11-30 15:03:22 +02:00
c7a9cbc646
Merged in maxim_productengine/viewer-neko_maint2 (pull request #104 )
...
MAINT-6967 FIXED Crash in LLFloaterAvatarPicker::find()
2016-11-30 04:41:48 +00: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
6204b7f1ed
MAINT-6967 FIXED Crash in LLFloaterAvatarPicker::find()
2016-11-29 17:17:28 +02:00
b40ac4325c
Merged in Ansariel/viewer-neko-ui-scaling (pull request #98 )
...
More improvements for UI scaling detection
2016-11-29 12:25:49 +00:00
f2b32dafa4
MAINT-6729 Fix crash in LLImageGL::analyzeAlpha()
2016-11-29 12:28:21 +02:00
6979fc5667
DRTVWR-418: Revert one more openjp2.dll reference to openjpeg.dll.
2016-11-28 15:45:58 -05:00
7d40f756b0
Fix UI scaling changed notice showing up on startup if system UI scale factor changed during last session
2016-11-25 17:40:48 +01:00
7d8bfcfb74
Don't resize viewer window if UI scaling didn't change
2016-11-25 17:28:48 +01:00
f9e0af1441
DRTVWR-418: Update to SDL build 501092.
2016-11-23 12:50:05 -05:00
aadeec30ed
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2016-11-23 12:09:40 -05:00
fc4564c415
DRTVWR-418: Work around missing LLCEFLibSettings::page_zoom_factor.
2016-11-23 12:08:53 -05:00
b9cc216b9c
DRTVWR-418: Have to #include "llkdumem.h" even when not LL_DARWIN.
2016-11-23 12:07:31 -05:00
64a0fac783
DRTVWR-418: Don't report anything in new build-vc120-{32,64}.
2016-11-23 12:06:31 -05:00
Oz Linden