summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-10merge changes for DRTVWR-280Oz Linden
2013-01-10tag merge of DRTVWR-280Oz Linden
2013-01-10merge changes for DRTVWR-279Oz Linden
2013-01-10tag merge of DRTVWR-279Oz Linden
2013-01-10pull back release tag for 3.4.4Oz Linden
2013-01-10mergeBrad Payne (Vir Linden)
2013-01-10SH-3639 WIP - increased retry interval to allow for intermittent extremely ↵Brad Payne (Vir Linden)
slow responses
2013-01-10MAINT-2209 Parcel name not updating after teleportKelly Washington
2013-01-10SH-3142: Added a debug option that circumvents the precache delay when ↵prep
teleporting.
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-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-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-09Added tag 3.4.4-release for changeset e1bb1ae7d8b1Oz Linden
2013-01-09SH-3600. Undo change is disabled upon reentry into the appearance panelprep
2013-01-09merge changes for DRTVWR-276Oz Linden
2013-01-09tag merge of DRTVWR-276Oz Linden
2013-01-09More merge cleanup.Dave Parks
2013-01-09More merge cleanup.Dave Parks
2013-01-09Merge cleanup.Dave Parks
2013-01-09mergeprep
2013-01-09SH-3620: Fix for editing a nocopy wearable being removed from the outfitprep
2013-01-08merge changes for DRTVWR-277Oz Linden
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08tag merge of DRTVWR-277Oz Linden
2013-01-08remove duplicated return (merge artifact)Oz Linden
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-08tag merge of DRTVWR-250Oz Linden
2013-01-08mergeBrad Payne (Vir Linden)
2013-01-07FIX INTL-110 remove utf8 BOMeli
2013-01-07FIX INTL-110 fix corrupted chinese character in translationeli
2013-01-07SH-3344 WIP - keep avatar local textures flagged no-delete while in useBrad Payne (Vir Linden)
2013-01-07merge with headcallum_linden
2013-01-04pull back 3.4.4-beta4 tagOz Linden
2013-01-04Added tag 3.4.4-beta4 for changeset 05d9f1dd7a95Oz Linden
2013-01-04merge back DRTVWR-275 from 3.4.4 betaOz Linden
2013-01-03tag merge of DRTVWR-275Oz Linden
2013-01-03MAINT-2184 [crashhunters] new crash in LLUUID::toStringKelly Washington
Fix dangling references.
2013-01-02merge changes for DRTVWR-269Oz Linden
2013-01-02tag merge of DRTVWR-269Oz Linden
2012-12-28merge changes for DRTVWR-272Oz Linden
2012-12-28tag merge of DRTVWR-272Oz Linden
2012-12-27merge changes for new Havok licenseOz Linden
2012-12-25merge changes for DRTVWR-273Oz Linden
2012-12-25tag merge of DRTVWR-273Oz Linden
2012-12-21merge accidental commit and its fixOz Linden
2012-12-21mergeBrad Payne (Vir Linden)
2012-12-21MAINT-2168: Backed out changeset fb93eecd462d, reapply fixNat Goodspeed
Now that we've backed out the premature push, reapply the actual fix to propagate it appropriately.
2012-12-21MAINT-2168: Backed out changeset 797318b62275, pushed to wrong repoNat Goodspeed
This changeset was prematurely pushed to the wrong repository. Back it out to propagate it the right way.
2012-12-21MAINT-2168: fail with real message if required var PORT not set.Nat Goodspeed
llhttpclient_test.cpp is only supposed to be run by test_llsdmessage_peer.py, as specified in llmessage/CMakeLists.txt. test_llsdmessage_peer.py sets the environment variable PORT before running INTEGRATION_TEST_llhttpclient. While it's not yet clear under what circumstances INTEGRATION_TEST_llhttpclient could find PORT not set (getenv() returning NULL), it's obvious that in that case, the previous code might well crash. Make it at least fail with an explanatory message rather than a mysterious large negative integer. In theory, occurrences of that message could help us solve the underlying issue.