ee3efc01e4
Merge downstream code
2013-05-20 11:31:04 -07:00
f940ccac71
Get latest from viewer-release
2013-05-20 11:29:00 -07:00
abdbf45aaa
MAINT-2616 : Updated my Intel driver and now have orange in buttons and
...
Inventory pull down bar causing blinks to screen. Pulled in FS code,
Reviewed by Kelly
2013-05-20 11:18:12 -07:00
0ebcb7e3fd
increment version to 3.5.3 to be higher than the release
2013-05-17 19:25:29 -04:00
8ee91f8259
Added tag 3.5.2-release for changeset 9b1b6f33aa53
2013-05-17 15:39:37 -04:00
2b41a539aa
Merge
2013-05-17 11:46:25 -07:00
0cb2b30bfb
Simple imposter AV rendering cleanup
2013-05-17 11:45:06 -07:00
89e1e01084
updated BuildParams to try to fix windows build issue
2013-05-15 22:28:51 -07:00
d69ffe1939
Added tag 3.5.2-beta6 for changeset 9013c07bfe1c
2013-05-15 18:48:28 -04:00
a606a1cd68
merged in branch for changing BuildParams
2013-05-15 14:57:56 -07:00
435bda9df4
turned off distcc for linux builds
2013-05-15 13:29:19 -07:00
ffec03515e
MAINT-2665: fix crashes being counted as wrong type in last_exec_event due to log macro wrapper
2013-05-15 15:45:30 -04:00
50e3b7da42
Merge
2013-05-15 11:01:11 -07:00
ec5bd94d59
BUG-2581 : [simon-ll-viewer-cat] Path cut, hollow and slice break planar
...
texture mapping on prims. Credits to DaveP
2013-05-15 11:00:00 -07:00
119e9b47f5
SH-4190 Reactivate unit tests neutered under MAINT-3202
...
HttpStatus unit tests have never caused a unit test failure but
they do have the word 'error' in their text descriptions which
gets picked up by the log processor in TC builds. So, reactivate
the tests and reform the descriptions.
2013-05-14 16:56:27 -04:00
917e7317c0
Merge. Refresh from viewer-cat after it pulled viewer-beta.
2013-05-14 15:12:46 -04:00
f111b5b113
Fix EOL characters
2013-05-14 09:24:58 -07:00
fddf97c6ba
Merge downstream viewer-bear and viewer-beta
2013-05-14 09:22:33 -07:00
2722ed29c9
Merge in latest viewer-beta
2013-05-14 09:17:25 -07:00
8a83408185
MAINT-2302 Tests frequently fail on Windows builds.
...
I'm calling this the more correct fix. The httprequest tests
actually talk to an HTTP server running in the Python test
scaffold script. Under severe CPU competition, it may not
get the cycles needed to start up and make progress. So this
modifies the test to spin a little faster and dwell waiting
on the server for a longer period. Hope this will be
adequate to make the tests reliable.
2013-05-14 11:52:12 -04:00
e743a56b14
Merge. Pull a fix from viewer-cat that went in after last merge.
2013-05-13 20:17:12 -04:00
b864cecd6c
De-bork the viewer merge, causing black in-world images. Reviewed by Kelly
2013-05-13 16:34:52 -07:00
73f474d886
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
2013-05-13 18:34:54 -04:00
81ffd3fcca
Whinge reduction effort on the unit tests. Python 2.7 SocketServer
...
library has new exception-throwing behavior when a client disconnects
unannounced. Generally ignore exceptions as a result as we don't
care about the server side. On HTTP trace-mode tests, spin a little
faster and longer to give libcurl time to emit all the junk it wants
to send us. Should reduce 'reasonable time' failures on tests <12>
and <13>.
2013-05-13 18:32:03 -04:00
fc4a6431c9
CHOP-942: fix crash if update check times out
2013-05-13 16:28:50 -04:00
180dd12ed6
Add BuildVersion.cmake to great chain of life
2013-05-10 17:11:12 -07:00
5717bcf4ae
MAINT-2672 Make windows flex/bison inputs identical to other platforms to make bison >= 2.7 work
2013-05-10 12:15:25 -07:00
4dd245055f
Added tag 3.5.2-beta5 for changeset 895628bb5e16
2013-05-10 14:44:52 -04:00
199086fada
merge changes for MAINT-2647
2013-05-10 12:56:25 -04:00
f6519afee0
tag merge of MAINT-2647
2013-05-10 12:56:21 -04:00
5687b0c4df
Merge
2013-05-09 15:30:49 -07:00
33d9adfa9a
Added tag 3.5.2-beta4 for changeset a314f1c94374
2013-05-09 18:02:31 -04:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
50bbb0b7ed
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-05-09 15:40:32 -05:00
b9bb95f8ae
MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.
2013-05-09 15:40:02 -05:00
be9f71d166
MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.
2013-05-09 15:40:02 -05:00
8895e79576
Merge downstream code / viewer-beta
2013-05-09 13:21:22 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
cd8e0b92e1
Tweak to ensure more avatar rendering info is sent to the simulator
2013-05-09 11:10:13 -07:00
d8f00dd1d1
MAINT-2665 FIX Crashes not being reported in some cases
...
made marker file lock use append, not truncate
2013-05-09 10:54:32 -07:00
0e93223aeb
Added tag 3.5.2-beta3 for changeset b6a4ac8f1916
2013-05-07 19:03:04 -04:00
592586052c
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-05-07 17:21:32 -05:00
dbfcd6c9c5
Optimization -- don't draw glow in alpha pool unless needed
2013-05-07 17:20:33 -05:00
545e033d1e
merge changes for DRTVWR-299
2013-05-07 15:11:55 -04:00
0f3d291ef6
tag merge of DRTVWR-299
2013-05-07 15:11:29 -04:00
f382233fbb
merge changes for DRTVWR-315
2013-05-07 13:38:39 -04:00
e921e51c18
tag merge of DRTVWR-315
2013-05-07 13:38:36 -04:00
f864a0b562
tag merge of DRTVWR-316
2013-05-07 13:38:07 -04:00
9707f09fd8
MAINT-2657 Fix (speculative) for Crash in LLAudioEngine_FMODEX::shutdown()
2013-05-06 15:01:13 -07:00
2a59fef6be
Merge. Pull from /lindenlab/viewer-cat prior to push.
2013-05-06 13:01:56 -04:00
simon