summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-05-13De-bork the viewer merge, causing black in-world images. Reviewed by Kellysimon
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-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
2013-04-29BUG-2295/MAINT-2624 [FIXED] Crash in HttpOpRequest::stageFromActive w/ ↵Monty Brandenberg
Content-Range Don't rely on a response body being present should a Content-Range header be parsed. Unit tests captured the original crash and confirm the fix.
2013-04-29Merge in downstream viewer-betasimon
2013-04-29MAINT-2613: remove duplicate entry for ↵Oz Linden
"DisablePrecacheDelayAfterTeleporting", and fix a few other llsd validity problems
2013-04-26Convert LLThreadSafeRefCount back to atomic ref counting. Reviewed by Kellysimon
2013-04-25Clean up LLSingleton work - special case to re-create instance if it's been ↵simon
deleted.
2013-04-25Revert ares and libcurl version update that was causing problems, revise curlsimon
handle duplication code. Reviewed by Kelly
2013-04-25increment viewer version number to 3.5.2 (in new file)Oz Linden
2013-04-25merge changes for latest viewer-developmentOz Linden
2013-04-25Enhance "duplicate seed caps" log message ... this needs more investigation.simon
Reviewed by Kelly
2013-04-24Remove an un-needed LL_CHECK_MEMORY checksimon
2013-04-24merge changes for DRTVWR-309Oz Linden
2013-04-24Follow-up code cleaning for LLToast work trying to get branch healthy.simon
Reviewed by Kelly
2013-04-24FIX INTL-114 translation for 9 languages of major update from CHUI (based on ↵eli
latest merge with viewer-development)
2013-04-24sync with viewer-development (per DRTVWR-309)eli
2013-04-24Trivial change to note that earlier changeset 27742 (1c3262183eb5) is asimon
re-work of the LLInstanceTracker code done by Richard. The commit comment is cryptic
2013-04-24Fix crash discovered during other testing. Reviewed by Kellysimon
2013-04-24diff -r 59c7bed66dfd indra/llcommon/lleventapi.hsimon
2013-04-23Mergesimon