Commit Graph

36189 Commits (e8aa2dd71fff7a39f2b03039b23afa8bdf804fcb)

Author SHA1 Message Date
Nicky e8aa2dd71f x64: Do not use a union of LLColor4U. Especially having the two pointer in there will blow up the struct to at least 8 byte, which will break VBO packing as this class needs to be 4 byte in size.
(transplanted from 847df86d6b5daa69dcfc428df18876a9c1e8bef6)
2016-04-22 14:58:25 +02:00
Nicky 30dcad4b95 Windows: 1. GWL_USERDATA must be GWLP_USERDATA to be compatible with x86 and x64. (GWL_USERDATA is deprecated anyway). 3. Replace Get/SetWindowLong with Get/SetWindoeLongPtr or placing this into GWLP_USERDATA will truncate the pointer.
(transplanted from 5f50745bff03700d3862a6bb1eb5936be0fdc6cd)
2016-04-22 14:55:19 +02:00
Nicky a116f96a2f Windows: USe the correct datatypes when calling the Windows API.
(transplanted from 8b0c42b1a4f0416a17c8ec6078a85c5773f69a25)
2016-04-22 13:02:37 +02:00
Nicky f86c1e4ebc Add build-vc120_x64/ to the ignore list.
(transplanted from 98e2f67eded2d68f9a3780e7f6ed1dbf2dc3a0a7)
2016-04-22 13:00:21 +02:00
Nicky 7640c2fb44 Windows x64: Cannot use inline assembly.
(transplanted from 0b621f8a1ee707527325eb70e59ef02c63e2bd10)
2016-04-22 12:59:59 +02:00
Nicky 637dc1f5a9 Windows x64: 64 bit implies SSE2, handle this accordingly when detecting if SSE2 is enabled.
(transplanted from 93492b84cb752dc79c74d9667f11edd76ace8f0b)
2016-04-22 12:59:41 +02:00
Nicky 056f098302 Windows x64: Cannot use inline assembly.
(transplanted from ee32840fc591f5529a0b544243e7b4146eb8f531)
2016-04-22 12:58:51 +02:00
Nicky d75a6ecbe5 Windows x64: Disable warning 4267 (it causes too much noise) and do not enable /arch:SSE2 (x64 implies SSE2 and setting the flag causes warnings).
(transplanted from 5a7cc3874065b13a83b8c7aa044fb07f38edd283)
2016-04-22 12:58:20 +02:00
Nicky f611c05355 Add windows64 config.
(transplanted from 96ec064688376d0f4bfbabcfe8d478227403b630)
2016-04-22 12:57:11 +02:00
Nat Goodspeed 222d5621fd DRTVWR-418: Use separate XML string elements for command arguments.
autobuild now passes a vector of arguments to the commands it executes,
instead of smashing everything together into a single string only to have
cmd.exe parse it back into individual arguments again. In general, this is a
good thing and more robust than before.

However, it surfaces the fact that sometimes people were lazy and encoded
things like "-configuration Release" or "-j 12" as single <string> elements in
the XML. When such things are handed to the command as a single argument string
containing a space, it can get confused.

Code (e.g.) <string>-configuration</string><string>Release</string> instead.
2016-11-08 22:22:39 -08:00
Nat Goodspeed bdd9777505 DRTVWR-418: Update to KDU build 500948. 2016-11-04 09:50:23 -04:00
Nat Goodspeed 0413e40d82 DRTVWR-418: Update KDU and llimagej2ckdu* with certain clang fixes. 2016-11-03 20:48:41 -04:00
Nat Goodspeed 6cc4a8dcd2 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-11-03 09:31:15 -04:00
Oz Linden 086c134215 increment viewer version to 4.1.2 2016-10-10 15:33:44 -04:00
Oz Linden 662cae23f6 Added tag 4.1.1-release for changeset b280a1c797a3 2016-10-10 15:33:44 -04:00
Callum Prentice 56953b146a Fix MAINT-6730 Media audio does not play when Media volume slider is set to max 2016-10-05 13:15:25 -07:00
Callum Prentice 1be15b3d3a Log volume control values for debugging 2016-09-30 15:20:37 -07:00
Rider Linden 100aa4b79e Merge 2016-09-16 14:59:52 -07:00
Rider Linden 884b03e877 Merge 2016-09-16 14:43:35 -07:00
Rider Linden 68b8d2658a MAINT-6570: Fix bad merge. 2016-09-16 14:38:35 -07:00
Oz Linden 51bb369a39 increment viewer version to 4.0.9 2016-09-15 15:31:31 -04:00
Oz Linden 7d20fbdb66 Added tag 4.0.8-release for changeset 45eaee56883d 2016-09-15 15:31:31 -04:00
Rider Linden 51236b7c9c Merge 2016-09-14 09:55:18 -07:00
callum@lindenlab.com 921cfa355c MAINT-6462 Built-in browser plays video vertically flipped 2016-09-09 11:46:50 -07:00
Callum Prentice 4a95c4b36c Restore version of CEF that has the correct Y flipping enabled - (2526/chrome47 version - soon to be replaced with 2704/chrome 51) 2016-09-07 16:13:09 -07:00
Nat Goodspeed c7cb6636c4 MAINT-6584, MAINT-5011: Change new 'throw' to LLTHROW()
to be consistent with new exception conventions.
2016-09-07 10:57:07 -04:00
Nat Goodspeed dd1a0218b1 Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc 2016-09-07 10:46:28 -04:00
Mnikolenko Productengine 1de6e0830c MAINT-6699 FIXED [VOB] Crash in LLSnapshotLivePreview::getBigThumbnailImage() 2016-09-07 17:26:07 +03:00
AndreyL ProductEngine 464d70c546 Dummy commit to fix the teamcity builds 2016-09-07 08:08:19 +03:00
Nat Goodspeed 2d3c5fb060 Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc 2016-09-06 20:52:57 -04:00
Nat Goodspeed 67c401047a MAINT-5011: Ensure BlockTimer::mStartTime is unconditionally set.
Previous logic could possibly leave mStartTime uninitialized, producing fatal
warnings with gcc 4.7.
2016-09-06 20:48:16 -04:00
Nat Goodspeed fe49126d45 MAINT-5011: Commit backing out BlockTimer warning suppression. 2016-09-06 20:42:27 -04:00
Nat Goodspeed bfb400ccd7 Backed out changeset c30d8774c404: remove warning suppression
for possibly-uninitialized data member in BlockTimer::BlockTimer.

NickyD suggested a real fix.
2016-09-06 20:41:23 -04:00
Oz Linden dc5a805efd undo changes to llvertexbuffer.cpp from c727ae93646e 2016-09-06 16:53:32 -04:00
Oz Linden 5edd4cecfc merge changes for exception handling 2016-09-06 11:07:39 -04:00
Oz Linden 8c86c594be paren fix 2016-09-06 11:01:02 -04:00
Oz Linden 72f4c72001 downgrade spammy LLCoros logging to DEBUG 2016-09-06 10:21:28 -04:00
Oz Linden a5adabb4f6 add protections against failed memory allocations in VBO and aligned memory 2016-09-06 10:04:19 -04:00
Oz Linden 53f9fbcfb7 add run time error checking to LLImageRaw::scale 2016-09-06 09:11:10 -04:00
Mnikolenko Productengine ec9b92d274 MAINT-6698 [VOB] "Save" button is always enabled for outfit with non-default image even if there were no changes 2016-09-06 14:07:20 +03:00
Mnikolenko Productengine fc17f62335 MAINT-6685 [VOB] Outfit Image from an Outfit Gallery disappears after editing outfit 2016-09-05 17:32:50 +03:00
Nat Goodspeed 1804da89ee MAINT-5011: Abbreviate __FILE__ path in log_unhandled_exception_().
LLError::abbreviateFile() is specifically to avoid cluttering log output with
the prefix of an absolute file path on the original build system, pointless
for anyone trying to read the log.
2016-09-02 14:00:18 -04:00
andreykproductengine 74ec1116a2 MAINT-6461 crash due to invalid menu pointer during visibility change 2016-09-02 19:20:31 +03:00
Nat Goodspeed 1ed351e28f MAINT-5011: Use LL_VLOGS() rather than raw lllog() macro.
Raw lllog() doesn't work for varying log level, which is why LL_VLOGS()
exists.
2016-09-01 19:46:39 -04:00
Nat Goodspeed 96467f09f2 Automated merge with file:///Users/nat/linden/viewer-comment-lllog 2016-09-01 19:44:38 -04:00
Nat Goodspeed 9be4e7e448 MAINT-5232: Introduce LL_VLOGS() macro: log call with variable level.
In some places we want to log the same information but with different severity
depending on specifics. In other cases we need to test the availability of the
logging subsystem before engaging it. LL_VLOGS() accepts an LLError::ELevel
argument that can differ with each call, while retaining the desirable feature
of deciding only once for each level.
2016-09-01 19:32:31 -04:00
Nat Goodspeed 7203162071 Automated merge with file:///Users/nat/linden/viewer-comment-lllog 2016-09-01 15:22:34 -04:00
Nat Goodspeed 31d3d654f1 MAINT-5011: Advise against lllog() instead of (e.g.) LL_INFOS(). 2016-09-01 15:21:54 -04:00
Mnikolenko Productengine 81b683f83b MAINT-6686 FIXED [VOB] Outfit Snapshot floater should be resized independently of general Snapshot floater 2016-09-01 16:40:41 +03:00
Nat Goodspeed 1bbc523b04 MAINT-5011: Revert to googlemock built on squeeze 2016-08-31 17:22:04 -04:00