summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-17Simple imposter AV rendering cleanupsimon
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 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-09Mergesimon
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-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-07merge changes for DRTVWR-315Oz Linden
2013-05-06MAINT-2657 Fix (speculative) for Crash in LLAudioEngine_FMODEX::shutdown()callum_linden
2013-05-06Merge. Pull from /lindenlab/viewer-cat prior to push.Monty Brandenberg
2013-05-06BUG-2295/MAINT-2624 unexpected crash around Content-Range: header processingMonty Brandenberg
Not certain what the source of the short data is with one resident but I'm going to make these problems retryable as they are transport-related. Lift the retry detection into a method that should be reusable by others interested in determining what is retryable. Trace output handling on the libcurl debug callback was attrocious. Some unsafe length handling on my part was protected by a second layer of defense. Made that correct and more useful by logging actual data sizes during trace.
2013-05-03MAINT-2655: "Block button in permissions dialog prompt does not block object"Kelly Washington
* Fix mute button.
2013-05-03mergeKelly Washington
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Switch mute to use task id. reviewed with Simon
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Change text of dialog * Add callback for mute button reviewed with Richard and Widely.
2013-05-02Cmake doesn't like mesimon
2013-05-02Fix the cmake fixsimon
2013-05-02Fix line endingssimon
2013-05-01Manually pull in Richard's fixes for llcommon/llsingleton.hsimon
2013-05-01MAINT-2629: limit stream searches to prevent hangs on bad streamscallum
2013-04-30MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Add the newer run time permissions to the viewer * Filter requested permissions by those the viewer knows about * Show a dialog indicating unknown permissions were requested and a new viewer will be needed to grant them. reviewed with Simon and Soft
2013-04-30MAINT-2640 Fix for Wrong name of the checkbox Pathfinding view/test floater.callum_linden
2013-04-30Merge downstream code from viewer-bearsimon
2013-04-30merge changes for CHOP-913Oz Linden
2013-04-29Merge in downstream code from viewer-betasimon
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-06 19:03:17 +0000