Rider Linden
28b98374da
Mac compile does not like not having a default even if it does nothing.
2017-11-27 11:12:29 -08:00
Rider Linden
66ba27cb91
Added boost::hash<> spec for LLSD
2017-11-27 10:19:43 -08:00
Rider Linden
0bf6386c61
Now with validation.
2017-11-17 13:04:28 -08:00
Rider Linden
35873f5963
Clean up on sun and moon
2017-11-13 16:43:47 -08:00
Rider Linden
b227c86b45
Remove the old wl environment code.
2017-11-13 14:40:54 -08:00
Rider Linden
b37eb2642f
Remove delete preset dialog, Initial settings for selection level (Region/Parcel/Local)
2017-11-10 16:17:25 -08:00
Rider Linden
d709c7f35e
Remove unused constant.
2017-11-09 09:54:23 -08:00
ruslantproductengine
77091b8080
MAINT-47 [PUBLIC]WindLight: Special overlays (including property lines and hilights for beacons) aren't visible in shader water
...
FIXED
2017-11-09 17:42:26 +02:00
Rider Linden
a700c2a2e9
Quick fix
2017-11-08 16:28:02 -08:00
Rider Linden
fe846ec994
Day cycles and animated sky/water blending.
2017-11-08 16:02:20 -08:00
Thomas Nelson
36c2992b01
Merged lindenlab/viewer64 into default
2017-11-03 12:16:36 -07:00
Rider Linden
61e6632a71
Initial day cycle impl.
2017-11-03 11:28:08 -07:00
Nat Goodspeed
6d94bb263f
DRTVWR-418: Update viewer-manager to codeticket version 510348.
2017-10-31 14:01:34 -04:00
Nat Goodspeed
d78391a27b
DRTVWR-418: Update viewer-manager to codeticket version 510328.
2017-10-31 11:45:53 -04:00
Nat Goodspeed
2690ad4b38
DRTVWR-418: Update viewer-manager to codeticket version 510301.
2017-10-30 17:28:22 -04:00
Nat Goodspeed
7e15d6ae4a
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2017-10-30 11:15:52 -04:00
Nat Goodspeed
f643f79f09
DRTVWR-418: Update viewer-manager to codeticket version 510243.
2017-10-27 15:22:12 -04:00
Nat Goodspeed
8ffaa4242b
DRTVWR-418, MAINT-7911: Merge to build 510144 of VMP
2017-10-26 10:13:12 -04:00
Nat Goodspeed
d8ea2a8a27
MAINT-7911: Update to viewer-manager build 510144
2017-10-26 09:48:26 -04:00
Nat Goodspeed
cc398dc397
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2017-10-26 09:42:14 -04:00
Nat Goodspeed
263f285697
MAINT-7911: Update viewer-manager to codeticket version 510137.
2017-10-25 21:22:35 -04:00
Nat Goodspeed
3f84c43e14
MAINT-7911: Set build_data.json's Platform to win for both W32, W64.
2017-10-25 14:33:26 -04:00
Nat Goodspeed
ead19aa22c
MAINT-7081: Only request HTTP2 with $VIEWERASSET override (testing)
2017-10-24 15:57:36 -04:00
Nat Goodspeed
762582c499
MAINT-7081: Mention libnghttp2*.dylib in yet another place.
2017-10-24 15:38:00 -04:00
Nat Goodspeed
b709a9d7e0
MAINT-7081: Fix bad merge into autobuild.xml.
...
Specifically, reinstate the curl, openssl, nghttp2 libraries to the previous
tip of this MAINT-7081 fork.
2017-10-24 13:22:03 -04:00
Nat Goodspeed
96ac49c3e2
MAINT-7081: Merge from lindenlab/viewer64.
2017-10-24 11:22:49 -04:00
Rider Linden
2161788711
Day cycles start
2017-10-20 16:37:03 -07:00
Rider Linden
ea90ebff22
Figure out later why this block timer suddenly starts crashing.
2017-10-19 14:55:46 -07:00
Rider Linden
de622ea576
Put the timer block back in.
2017-10-19 11:24:16 -07:00
Rider Linden
c6ae9408aa
Fix mac compile unused names in namespace.
2017-10-19 10:03:10 -07:00
Nat Goodspeed
8ba4f526c0
MAINT-7812: NSIS check for /marker before writing marker file.
...
The /marker switch is passed by the (new) VMP. If any user wants to explicitly
pass the /marker switch to the installer, s/he shouldn't mind ending up with
an nsis.winstall file in the download directory.
2017-10-18 16:16:34 -04:00
Nat Goodspeed
b0eb67f6a8
MAINT-7812: Update to viewer-manager build 509841
2017-10-18 15:36:00 -04:00
Rider Linden
ec8e163910
Comment out unused static function for mac
2017-10-17 16:00:07 -07:00
Rider Linden
cf74a9438a
Merge
2017-10-17 14:40:59 -07:00
Rider Linden
24ed3844af
Initial day cycle checkin.
2017-10-17 14:40:21 -07:00
Thomas Nelson
5754493cdc
Merged lindenlab/viewer64 into default
2017-10-17 13:38:39 -07:00
Rider Linden
00ce291f01
New prototype control for moving sun and moon in sky.
2017-10-17 12:03:26 -07:00
Rider Linden
b4d1b1c43b
Removed conversions from WLColor Control in favor of setter/getter
2017-10-16 11:13:45 -07:00
Rider Linden
cc22ffc6d7
Watter settings active and start of new joystick button type.
2017-10-13 17:17:49 -07:00
Nat Goodspeed
9c5becd67d
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2017-10-13 13:50:46 -04:00
Kitty Barnett
7d63a3fa5f
[FIXED] Access (write) violation / buffer overrun in LLTextureFetchWorker::doWork()
...
The trouble lines are:
U8 * buffer = (U8 *) ALLOCATE_MEM(LLImageBase::getPrivatePool(), total_size);
if (cur_size > 0)
{
memcpy(buffer, mFormattedImage->getData(), cur_size);
}
If 'cur_size > mHttpReplyOffset + append_size' then 'total_size -= src_offset' will cause
total_size to be smaller than cur_size causing a write access violation on the memcpy.
Since the response is invalid it seemed best to make it follow the other failed partial condition.
(transplanted from 737e28ec6b4d74f3ff915a4effc13d7b615a6a9b)
2017-10-12 22:55:15 +02:00
Nat Goodspeed
eafb0a32e3
DRTVWR-418: Remove redundant assignment per Ansariel Hiller.
2017-10-12 08:25:12 -04:00
Nat Goodspeed
e80797a5ef
MAINT-7081: Update to curl build 501064
2017-10-12 08:13:49 -04:00
Nat Goodspeed
6ab816cc68
DRTVWR-418: Fix glitch from merging from today's viewer-release
2017-10-11 16:50:51 -04:00
Nat Goodspeed
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
Oz Linden
b6d22de588
increment viewer version to 5.0.9
2017-10-11 09:10:47 -04:00
Oz Linden
4cee904dc3
Added tag 5.0.8-release for changeset 505a492f30bd
2017-10-11 09:10:47 -04:00
Nat Goodspeed
25be14381e
MAINT-7831: Update to viewer-manager build 509523
2017-10-10 15:41:37 -04:00
Nat Goodspeed
acf36ae829
MAINT-7081: Hack to allow overriding asset capability URL.
2017-10-10 15:12:05 -04:00
Nat Goodspeed
c4c3438e88
MAINT-7831: Merge from tip of https://bitbucket.org/lindenlab/viewer64 .
2017-10-09 16:50:50 -04:00