Commit Graph

35378 Commits (e6fb7564b02ba73c8a402efaca65cb944ce7bef2)

Author SHA1 Message Date
callum_linden e6fb7564b0 Automatic merge with head 2016-05-06 14:32:39 -07:00
callum_linden 94a8c11389 Merge with https://bitbucket.org/oz_linden/maint-5974 to pick up a variety of fixes 2016-05-06 13:41:46 -07:00
callum_linden c5d6bfe8ae Merge with viewer-release 2016-05-06 13:40:29 -07:00
Oz Linden 7f5e6cea12 fix cmake warning by conditionalizing dependency that does not exist on Macs 2016-05-06 09:19:12 -04:00
Oz Linden a07a8cbf6e merge changes for 4.0.4-release 2016-05-06 09:05:51 -04:00
Oz Linden 94559950a2 increment viewer version to 4.0.5 2016-05-06 08:56:31 -04:00
Oz Linden 1114d681f1 Added tag 4.0.4-release for changeset 0a5de9ec2cb8 2016-05-06 08:56:31 -04:00
Oz Linden c938e16506 various changes required to compile on new clang 2016-05-05 13:53:07 -04:00
Nat Goodspeed ec0e3e9f08 DRTVWR-418: Match KDU_X86_INTRINSICS macro set for KDU package build. 2016-04-26 22:23:18 -04:00
Rider Linden 3771778ac3 Merge 2016-04-26 16:20:01 -07:00
Rider Linden 66dd72459a MAINT-6336: Initialize TempBoundListener with constructor 2016-04-26 13:44:44 -07:00
callum_linden 811a0b5726 DRTVWR-418: add preprocessor define to fix linker error introduced in v7.8 2016-04-26 12:14:29 -07:00
Rider Linden dd2311b993 MAINT-6336: Put the timeout upstream of the suspending pump and fire the timeout it. Also some cleanup on LLSD construction in vivox. 2016-04-26 11:56:25 -07:00
Nat Goodspeed b9fa7e7aeb Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2016-04-25 22:57:29 -04:00
Nat Goodspeed a0052fac05 DRTVWR-418: Fix indra/llkdu wrapper for changes in KDU 7.8 API.
KDU 7.8 introduces a number of changes to its API, most notably by moving
public symbols into a variety of kdu_something namespaces. While this is
laudable in a general sense, it does require quite a bit of diagnostic
building and patching to update legacy code.

Since llimagej2ckdu_test.cpp lamentably stubs out pretty much the entire KDU
API, we must also fix those stubs for signature changes even to functions we
don't otherwise reference.

NOTE: This commit still leaves four symbols undefined. Below I have taken the
liberty of juxtaposing the error line with the output from dumpbin /exports
build-vc120/packages/lib/release/kdu.lib. I see no differences.

unresolved symbol (?kdu_convert_ycc_to_rgb_rev16@kdu_core@@3P6AXPAF00H@ZA)   "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev16)(short *,short *,short *,int)"
                   ?kdu_convert_ycc_to_rgb_rev16@kdu_core@@3P6AXPAF00H@ZA    (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev16)(short *,short *,short *,int))
unresolved symbol (?kdu_convert_ycc_to_rgb_irrev16@kdu_core@@3P6AXPAF00H@ZA) "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev16)(short *,short *,short *,int)"
                   ?kdu_convert_ycc_to_rgb_irrev16@kdu_core@@3P6AXPAF00H@ZA  (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev16)(short *,short *,short *,int))
unresolved symbol (?kdu_convert_ycc_to_rgb_rev32@kdu_core@@3P6AXPAH00H@ZA)   "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev32)(int *,int *,int *,int)"
                   ?kdu_convert_ycc_to_rgb_rev32@kdu_core@@3P6AXPAH00H@ZA    (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev32)(int *,int *,int *,int))
unresolved symbol (?kdu_convert_ycc_to_rgb_irrev32@kdu_core@@3P6AXPAM00H@ZA) "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev32)(float *,float *,float *,int)"
                   ?kdu_convert_ycc_to_rgb_irrev32@kdu_core@@3P6AXPAM00H@ZA  (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev32)(float *,float *,float *,int))
24>C:\Users\Nat\linden\viewer64\build-vc120\newview\RelWithDebInfo\secondlife-bin.exe : fatal error LNK1120: 4 unresolved externals
2016-04-25 22:56:58 -04:00
Nat Goodspeed 979417fbd5 DRTVWR-418: Fix MD5 hashes for KDU 314311 packages. 2016-04-25 22:48:51 -04:00
Rider Linden 1eaed3d37f Merge 2016-04-25 12:12:18 -07:00
Rider Linden 4d9dd3271b MAINT-6338: Add methods for getting and setting boolean properties from gSavedSettings in the HTTPCore. Use those methods to access new key HTTPLogBodyOnError. Dump body of HTTP message to log in case of error if this key is true. 2016-04-25 12:06:33 -07:00
Rider Linden 1fa2757511 Debug code snuck in. 2016-04-22 15:14:30 -07:00
Rider Linden fd8b7a3934 Merge 2016-04-22 14:52:36 -07:00
callum_linden 6b9ceb561c DRTVWR-418 Remove references to gtk-atk-pango-glib from Windows build since it's not used there 2016-04-22 14:34:42 -07:00
callum_linden 741ab668c4 DRTVWR-418 Update the version of cef-bin via llceflib that we consume (no code changes, just updating to latest after changes to documentation/private status) 2016-04-22 13:45:27 -07:00
Rider Linden 899489ae0a MAINT-6336: Centralize waiting on event pump with a timeout. Shorten the lifespan of a timeout event pump lifespan to be no longer than necessary. Change all references to the LLEventTimer to instead uses the centralized version. 2016-04-22 12:07:27 -07:00
callum_linden aa407cb925 DRTVWR-418 pull in fixed (all headers) version of NVAPI 2016-04-21 18:42:44 -07:00
Andrey Lihatskiy d6f454831f Merged lindenlab/viewer-bear into default 2016-04-22 04:23:53 +03:00
callum_linden 28eaac8264 DRTVWR-418 downgrade NVAPI package - very newest version was incompatible with viewer code 2016-04-21 16:22:24 -07:00
callum_linden b50df60aa1 DRTVWR-418 remove vestiges of TCMALLOC and GooglePerfTools from the viewer 2016-04-21 16:13:39 -07:00
AndreyL ProductEngine 56f736b654 Merged in cinderblocks/storm-2127 2016-04-21 22:48:32 +03:00
callum_linden cfba9a9dca DRTVWR-418 remove references to some misc files I missed 2016-04-21 11:58:01 -07:00
Rider Linden 6ad159c052 MAINT-6336: Merge 2016-04-21 11:54:33 -07:00
callum_linden c6725ef975 DRTVWR-418 remove references to unused TestApps folder (used to contain media_plugin_test) 2016-04-21 11:54:13 -07:00
callum_linden b9c1a720d5 DRTVWR-418 remove references to unused FreeGlut and GLUI packages 2016-04-21 11:53:10 -07:00
callum_linden 219786b223 DRTVWR-418 remove references to unused Google Perf Tools package 2016-04-21 11:52:24 -07:00
callum_linden 5b69845c86 DRTVWR-418 remove references (and files) for QuickTime 2016-04-21 11:50:55 -07:00
callum_linden 162094e228 DRTVWR-418 add references to new third party packages 2016-04-21 11:47:20 -07:00
Rider Linden 8f4be8bb86 MAINT-6336: Removed or demoted some of the chatty log messages I was using to track progress. 2016-04-21 09:16:50 -07:00
Cinder Biscuits a07897bf9c contributions.txt edited online with Bitbucket 2016-04-21 01:27:52 +00:00
Cinder c2c0c537bb STORM-2127 - Fix NSException when assigning values that don't exist in cocoa modifier key event. 2016-04-20 16:13:17 -06:00
Rider Linden d96004e4af MAINT-6336: Crasher showing up in voice was a Bound Listener that should have been a Temp Bound listener. 2016-04-20 10:21:35 -07:00
Oz Linden 6de1d311f9 reset crash dump upload retries and timeouts 2016-04-20 12:26:28 -04:00
Oz Linden ddd476c90c MAINT-6322 fix merge error that prevented crash dumps from being located for upload (and add better logging) 2016-04-20 11:52:00 -04:00
Rider Linden 16e06b4b50 MAINT-6336: more loging for test build. 2016-04-19 14:17:28 -07:00
Rider Linden 86a3e1a3dc MAINT-6336: Crasher on disconnect in DDoS. 2016-04-19 14:10:57 -07:00
Rider Linden e7f03a77bf MAINT-6336: Better retry and timeout logic when logging in to the vivox server and connecting to a session. 2016-04-18 14:31:14 -07:00
Rider Linden 7de3a6e819 Merge 2016-04-14 12:46:32 -07:00
andreykproductengine 2f964c3ef7 Build fix for 'undefined behavior' error 2016-04-14 21:57:40 +03:00
Rider Linden c04f632218 Merged lindenlab/viewer-bear into default 2016-04-14 11:46:19 -07:00
Rider Linden f9f5003f4a Merge 2016-04-14 11:31:11 -07:00
callum_linden 09ab4b7cdd maint-5711 (fix) profiles and marketplace are asking for a login each session 2016-04-14 11:31:07 -07:00
Rider Linden 9418e8b876 MAINT-6305: Forgot to add the coro name. 2016-04-13 14:45:36 -07:00