summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-01-11Automated merge with file:///c:%5Ccode%5Cviewer-interesting-metricsRichard Linden
2013-01-11SH-3406 WIP convert fast timers to lltrace systemRichard Linden
moved thread local storage to its own cpp file
2013-01-11MAINT-1481: Clean up update_install UI, including error output.Nat Goodspeed
Capture actual error output from mkdir and mv; display it to user. Introduce mysudo function used by sudo_mv function for graphical sudo command. Since update_install actually only displays a single status message, just use zenity --info instead of a zenity progress box: need not update its message. Borrow semantics for clear_message and status functions from xmenity script. Introduce errorbox function so we only have to make zenity/xmessage test once. Move cleanup, onexit to top so we can use for clear_message.
2013-01-11MAINT-1481: Remove xmenity script and viewer_manifest.py references.Nat Goodspeed
2013-01-10Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metricsRichard Linden
2013-01-10Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metricsRichard Linden
2013-01-10SH-3406 WIP convert fast timers to lltrace systemRichard Linden
fix for gcc build error
2013-01-10SH-3405 WIP convert existing stats to lltrace systemRichard Linden
fixed gcc errors in llscenemonitor.cpp
2013-01-10Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingRichard Linden
2013-01-11gcc fixesAndrew Meadows
2013-01-10merge changes for DRTVWR-280Oz Linden
2013-01-10MAINT-2209 Parcel name not updating after teleportKelly Washington
2013-01-10MAINT-1481: minor bug fix plus incomplete UI tweaks.Nat Goodspeed
Test for existence of target name using -e rather than -f. (-d would work too, but in this case we must respond to any name collision, whether file or directory.) Instead of terminating on failure, make sudo_mv return rc of the [sudo] mv command to its caller. If the attempt to move new install to actual viewer directory fails, restore previous viewer before failing. When redirecting the script's stderr to updater.log, first save existing stderr to another file descriptor, and restore it when we launch viewer. Otherwise updater.log ends up collecting the viewer's duplicate stderr log output! The construct 'exec ... | program' doesn't work. In fact it causes any other redirections on that command to fail too. Remove it -- real fix pending.
2013-01-10Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metricsRichard Linden
2013-01-10removed compiler flag not understood by OS X version of gccAndrew Meadows
2013-01-10Automated merge with file:///d:%5Ccode%5Cviewer-interesting-metricsRichard Linden
2013-01-10fix for invalid use of posix_memalignAndrew Meadows
2013-01-10Automated merge with file:///d:%5Ccode%5Cviewer-interesting-metricsRichard Linden
2013-01-10SH-3468 WIP add memory tracking base classRichard Linden
actually use return value of posix_memalign!
2013-01-09Automated merge with file:///d:%5Ccode%5Cviewer-interesting-metricsRichard Linden
2013-01-10typo fixAndrew Meadows
2013-01-09added newline to fix gcc buildsRichard Linden
2013-01-09Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metricsRichard Linden
2013-01-09Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metricsRichard Linden
2013-01-09SH-3468 WIP add memory tracking base classRichard Linden
made LLTrace::MemTrackable support custom alignment LLDrawable now uses MemTrackable new and delete operators
2013-01-09fix a type casting error.Xiaohong Bao
2013-01-09Automated merge with https://hg.lindenlab.com/richard/viewer-interestingXiaohong Bao
2013-01-09fix the merge errors from the changeset 3eadda9666cfXiaohong Bao
2013-01-10yet more gcc fixesAndrew Meadows
2013-01-10gcc fixesAndrew Meadows
2013-01-09MAINT-1481: remove linux-updater; move logic to Linux update_installNat Goodspeed
Now that the viewer's own background updater logic is responsible for downloading a new installer, the only functionality we still use in linux-updater that couldn't be expressed more simply in bash is the UI. But since most Linux distros capable of running SL at all have zenity, and all will have xmessage, we can handle even the UI part. Add xmenity wrapper script so update_install doesn't have to care which is present, and make the bash script that used to launch linux-updater do the real work.
2013-01-10gcc fixesAndrew Meadows
2013-01-09viewer-development mergeBaker Linden
2013-01-09[MAINT-2185] Unable to upload terrain .raw filesBaker Linden
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path)
2013-01-09merge changes for DRTVWR-276Oz Linden
2013-01-09SH-3468 WIP add memory tracking base classRichard Linden
fix for linux build issues
2013-01-09More merge cleanup.Dave Parks
2013-01-09More merge cleanup.Dave Parks
2013-01-09Merge cleanup.Dave Parks
2013-01-08SH-3468 WIP add memory tracking base classRichard Linden
cleaned up hacks used to get unit tests working LLTrace::init now supports recursive initialization/cleanup put NOMINMAX back in win32 header wrappers
2013-01-08SH-3406 WIP convert fast timers to lltrace systemRichard Linden
fixed Windows build problem (NOMINMAX redefinition)
2013-01-08MergeXiaohong Bao
2013-01-08merge changes for DRTVWR-277Oz Linden
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08remove duplicated return (merge artifact)Oz Linden
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-08SH-3468 WIP add memory tracking base classRichard Linden
more fixes for unit test crashes added llcommon initialization/teardown for unit tests that indirectly trigger lltrace changed access of atomic refcount to use preincrement/decrement operators to reflect desired semantics always call apr_initialize in LLCommon::initClass, even if already initialized...apr does internal reference counting to keep things straight
2013-01-07FIX INTL-110 remove utf8 BOMeli
2013-01-07FIX INTL-110 fix corrupted chinese character in translationeli
2013-01-07merge with headcallum_linden