summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-04-30Merge downstream code from viewer-bearsimon
2013-04-29Merge in downstream code from viewer-betasimon
2013-04-29Merge in downstream viewer-betasimon
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-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-24Follow-up code cleaning for LLToast work trying to get branch healthy.simon
Reviewed by Kelly
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
2013-04-23Revert LLThreadSafeRefCount optimization; caps fetching was failing. ↵simon
Reviewed by Kelly
2013-04-23Fix Windows Debug buildsimon
2013-04-23Added tag 3.5.1-beta3 for changeset 65ae89aeb7eaOz Linden
2013-04-23tag merge of DRTVWR-314Oz Linden
2013-04-23merging in tags from beta 2Nyx Linden
2013-04-22SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special ↵Nyx Linden
characters. Integrated Nicky Dasmijn's patch to handle the unicode file paths properly. Code reviewed, patch was clean. Tested locally, correctly allows wearables to load where they would fail before. Should be ready for automated build & QA.
2013-04-22MAINT-2612 fix issues between extern C linkage and yyval ifdefs on Mac with ↵Graham Madarasz
toolchain > 4.5.1
2013-04-22MAINT-2612: Remove no-longer-valid unused-var warning suppressions.Nat Goodspeed
Somehow viewer-cat acquired a lot of source lines (in several different files) of the form: (void)somevar; where ?somevar? was not declared. Apparently someone introduced an unused declaration of ?somevar?, encountered unused-variable warnings, introduced the (void) casts to suppress those warnings, then deleted the declarations -- without deleting the (void) casts. It seems worth noting that the resulting code should not have compiled successfully on any platform.
2013-04-18MAINT-2605 : Eliminate LLControlGroup::set warning in log when starting the ↵Simon Linden
viewer
2013-04-18Added tag 3.5.1-beta2 for changeset 9d8726eca785Oz Linden
2013-04-18tag merge of DRTVWR-313Oz Linden
2013-04-17BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident ↵Nyx Linden
picker Added checks to validate that the selection list is non-empty
2013-04-17merging with viewer-betaNyx Linden
2013-04-17SUN-70 MAINT-2597 FIX Crash when trying to edit no-modify objectsNyx Linden
Added protection for invalid / empty inventory contents
2013-04-17SH-4125 FIX - problem was unpredictable ordering of avatar and ↵Brad Payne (Vir Linden)
llviewerregion deletion. Avoid trying to send metrics when we're shutting down and it's too late anyway. Reviewed by Nyx
2013-04-17Some minor cleanups while hunting crashes. Reviewed by Kellysimon
2013-04-15Mergesimon
2013-04-15MAINT-2548 : Add debug viewer render info for AV metrics. Reviewed by Kellysimon
2013-04-15Fix crash introduced by LLInstanceTrackerBase optimization. Reviewed by Kellysimon
2013-04-15MAINT-2598 : Viewer logs warning about VoiceServiceConnectionStateChangedEventsimon
2013-04-15MAINT-2595 - Viewer spams log at startup with caps issue. Reviewed by Kellysimon
2013-04-15Merge downstream codesimon
2013-04-15Merge in viewer-development once more, 'cause it feels goodsimon
2013-04-12increment version to 3.5.2Oz Linden
2013-04-12Fix merge odditiessimon
2013-04-12Added tag 3.5.1-beta1 for changeset 20cdf370f5c8Oz Linden
2013-04-12pull changes for Sunshine betaOz Linden
2013-04-12Added tag 3.5.1-beta1 for changeset 0ca3910763ceOz Linden
2013-04-11mergesimon
2013-04-11Mergesimon
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon