summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-12-23Automated merge with ssh://hg.lindenlab.com/nat/viewer-leapNat Goodspeed
2011-12-23Make pipe-management logic more robust.Nat Goodspeed
Previous logic was vulnerable to the case in which both pipes reached EOF in the same loop iteration. Now we use std::list instead of std::vector, allowing us to iterate and delete with a single pass.
2011-12-22Comment out lookup table used only by commented-out code.Nat Goodspeed
Otherwise the unreferenced declaration causes a fatal warning.
2011-12-22Never call apr_proc_wait() inside child_status_callback().Nat Goodspeed
Quiet the temporary child_status_callback() output. Add a bit of diagnostic info if apr_proc_wait() returns anything but APR_CHILD_DONE.
2011-12-22Add child_status_callback() function and arrange to call periodically.Nat Goodspeed
At least on OS X 10.7, a call to apr_proc_wait(APR_NOWAIT) in fact seems to block the caller. So instead of polling apr_proc_wait(), use APR callback mechanism (apr_proc_other_child_register() et al.) and poll that using apr_proc_other_child_refresh_all(). Evidently this polls the underlying system waitpid(), but the internal call seems to better support nonblocking. On arrival in the child_status_callback(APR_OC_REASON_DEATH) call, though, apr_proc_wait() produces ECHILD: the child process in question has already been reaped. The OS-encoded wait() status does get passed to the callback, but then we have to use OS-dependent macros to tease apart voluntary termination vs. killed by signal... a bit of a hole in APR's abstraction layer. Wrap ensure_equals() calls with a macro to explain which comparison failed.
2011-12-21Tweak llprocesslauncher_test.cpp to run properly on Windows.Nat Goodspeed
Fix EOL issues: "\r\n" vs. "\n". On Windows, requesting a read in nonblocking mode can produce EAGAIN instead of EWOULDBLOCK.
2011-12-21Change llprocesslauncher_test.cpp eyeballing to program verification.Nat Goodspeed
That is, where before we just flung stuff to stdout with the expectation that a human user would verify, replace with assertions in the test code itself. Quiet previous noise on stdout. Introduce a temp script file that produces output on both stdout and stderr, with sleep() calls so we predictably have to wait for it. Track and then verify the history of our interaction with the child process, noting especially EWOULDBLOCK attempts.
2011-12-21Fix llprocesslauncher_test.cpp to work on Windows.Nat Goodspeed
2011-12-21Add unit-test module for LLProcessLauncher.Nat Goodspeed
As always with llcommon, this is expressed as an "integration test" to sidestep a circular dependency: the llcommon build depends on its unit tests, but all our unit tests depend on llcommon. Initial test code is more for human verification than automated verification: does APR's child-process management in fact support nonblocking operations?
2011-12-20merge changes for storm-1734Oz Linden
2011-12-20merge changes for storm-653 and storm-1737Oz Linden
2011-12-20merge up to latest viewer-developmentOz Linden
2011-12-19merge changes for vmrg-206Oz Linden
2011-12-19merge changes for storm-1737Oz Linden
2011-12-18STORM-1737 panel_edit_skin.xml uses confusing historical terminologyJonathan Yap
2011-12-17STORM-653 As a user i would like to be able to see the available number of ↵Jonathan Yap
attachments and remaining free slots.
2011-12-16EXP-1742 FIX -- Clicking IM notification or receiving multiple IM ↵Leslie Linden
notifications in quick succession crashes to desktop * Moved toast logic for mouse hover out of the draw call to avoid chain of callbacks that lead to reordering of the draw list while we are iterating over it.
2011-12-16merge changes for storm-1729Oz Linden
2011-12-16merge snowstorm issues to latest viewer-developmentOz Linden
2011-12-16merge changes for vmrg-206Oz Linden
2011-12-15merge changes for storm-1653Oz Linden
2011-12-15merge changes for storm-1731Oz Linden
2011-12-15merge changes for storm-1723Oz Linden
2011-12-15merge changes for storm-1733Oz Linden
2011-12-15storm-1723: fix character display when a lot of different characters are usedAlissa Sabre
2011-12-15merge changes for vmrg-205Oz Linden
2011-12-14WIP VWR-23642eli
2011-12-14FIX VWR-23635eli
2011-12-14FIX VWR-22449eli
2011-12-14STORM-1736 Cropped buttons in the bottom of the Ad-hoc floaterJonathan Yap
2011-12-14FIX VWR-22392eli
2011-12-14sync with viewer-developmenteli
2011-12-14STORM-1733 Menu entry Release Keys is in Advanced->Shortcuts sub-menu but ↵Jonathan Yap
has no shortcut
2011-12-14EXP-1635 FIXED Made it clear that inventory snapshots are limited to 512x512 px.Vadim ProductEngine
2011-12-14EXP-1639 FIXED Fixed a resolution rounding error.Vadim ProductEngine
The error sometimes led to the following issues with maximized viewer window on MS Windows: * displaying incorrect resolution * failure to update snapshot
2011-12-13storm-1729: ensure that cpu id has no leading or trailing spaces for ease of ↵Oz Linden
comparison and formatting
2011-12-12VWR-27832 L$ Transfer failures show alert as if successfulJonathan Yap
2011-12-12STORM-1731 Adjusted if muted logic slightlyJonathan Yap
2011-12-12STORM-1731 Changes per RB comments: changed llwarns to llinfos, added check ↵Jonathan Yap
so you cannot mute a Linden
2011-12-12increment viewer version to 3.2.6Oz Linden
2011-12-12merge changes for vmrg-202Oz Linden
2011-12-12merge changes for vmrg-204Oz Linden
2011-12-12merge changes for vmrg-203Oz Linden
2011-12-12STORM-1731 Ad-hoc confererence block failing. Residents using it to start ↵Jonathan Yap
massive multi-sim conferences, used as a griefing tool.
2011-12-09FIX VWR-27811eli
2011-12-09sync with viewer-developmenteli
2011-12-09Backed out changeset fafd857891b1Dave Parks
2011-12-09merge changes for vmrg-201Oz Linden
2011-12-08fix for build error (warning for unreachable code)Richard Linden
2011-12-08FIX VWR-21237eli