summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-22Revert changes for MAINT-2616 due to licensing issues, need a full patchsimon
submitted to be acceptable
2013-05-21MAINT-2676 - Set home to here - screen_home.bmp not saved. Reviewed by Kelly.simon
2013-05-21Add fmod.log to .hgignoresimon
2013-05-21MAINT-2711 : Add missing LSL constants for llGetObjectDetails() to the viewer.simon
Reviewed by Kelly
2013-05-20Merge downstream codesimon
2013-05-20Get latest from viewer-releasesimon
2013-05-20MAINT-2616 : Updated my Intel driver and now have orange in buttons andsimon
Inventory pull down bar causing blinks to screen. Pulled in FS code, Reviewed by Kelly
2013-05-17increment version to 3.5.3 to be higher than the releaseOz Linden
2013-05-17Added tag 3.5.2-release for changeset 9b1b6f33aa53Oz Linden
2013-05-17Mergesimon
2013-05-17Simple imposter AV rendering cleanupsimon
2013-05-15updated BuildParams to try to fix windows build issueJJ Linden
2013-05-15Added tag 3.5.2-beta6 for changeset 9013c07bfe1cOz Linden
2013-05-15merged in branch for changing BuildParamsJJ Linden
2013-05-15turned off distcc for linux buildsJJ Linden
2013-05-15MAINT-2665: fix crashes being counted as wrong type in last_exec_event due ↵Oz Linden
to log macro wrapper
2013-05-15Mergesimon
2013-05-15BUG-2581 : [simon-ll-viewer-cat] Path cut, hollow and slice break planarsimon
texture mapping on prims. Credits to DaveP
2013-05-14SH-4190 Reactivate unit tests neutered under MAINT-3202Monty Brandenberg
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-14Merge. Refresh from viewer-cat after it pulled viewer-beta.Monty Brandenberg
2013-05-14Fix EOL characterssimon
2013-05-14Merge downstream viewer-bear and viewer-betasimon
2013-05-14Merge in latest viewer-betasimon
2013-05-14MAINT-2302 Tests frequently fail on Windows builds.Monty Brandenberg
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-13Merge. Pull a fix from viewer-cat that went in after last merge.Monty Brandenberg
2013-05-13De-bork the viewer merge, causing black in-world images. Reviewed by Kellysimon
2013-05-13Merge. Refresh from /lindenlab/viewer-cat prior to pushing.Monty Brandenberg
2013-05-13Whinge reduction effort on the unit tests. Python 2.7 SocketServerMonty Brandenberg
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-13CHOP-942: fix crash if update check times outOz Linden
2013-05-10Add BuildVersion.cmake to great chain of lifeGraham Madarasz
2013-05-10MAINT-2672 Make windows flex/bison inputs identical to other platforms to ↵Graham Madarasz
make bison >= 2.7 work
2013-05-10Added tag 3.5.2-beta5 for changeset 895628bb5e16Oz Linden
2013-05-10merge changes for MAINT-2647Oz Linden
2013-05-10tag merge of MAINT-2647Oz Linden
2013-05-09Mergesimon
2013-05-09Added tag 3.5.2-beta4 for changeset a314f1c94374Oz Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-05-09MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.Dave Parks
2013-05-09MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.Dave Parks
2013-05-09Merge downstream code / viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-09Tweak to ensure more avatar rendering info is sent to the simulatorsimon
2013-05-09MAINT-2665 FIX Crashes not being reported in some casesRichard Linden
made marker file lock use append, not truncate
2013-05-07Added tag 3.5.2-beta3 for changeset b6a4ac8f1916Oz Linden
2013-05-07Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-05-07Optimization -- don't draw glow in alpha pool unless neededDave Parks
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-05-07tag merge of DRTVWR-299Oz Linden
2013-05-07merge changes for DRTVWR-315Oz Linden