summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-01-28For MAINT-2276 a workaround to unblock 3.4.5 beta review: tedGraham Madarasz (Graham)
2013-01-25merge changes for DRTVWR-290Oz Linden
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break tanks. Reverts MAINT-1742
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break doors. Reverst MAINT-2247
2013-01-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2013-01-24MAINT-2277 Yellow "fence" (selection) of the parcel doesn't update after ↵Kelly Washington
selecting the other parcel * Removed bogus check on matching parcel data coming in.
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
2013-01-22merge changes for DRTVWR-287Oz Linden
2013-01-16MAINT-2247 Child object does not update rotation while selected.Kelly Washington
2013-01-16MAINT-2242 Fix for shader compilation errors on Intel HD graphics chips.Dave Parks
2013-01-14merge changes for DRTVWR-283Oz Linden
2013-01-11merge changes for DRTVWR-281Oz Linden
2013-01-11fix line endingscallum_linden
2013-01-11MAINT-417 Backed out changeset: 7273a1ac51e8Dave Parks
2013-01-11MAINT-1481: use 'mktemp -d' to generate tempdir.Nat Goodspeed
Responding to Lex's code-review comments.
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-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-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-09merge changes for 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-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-07FIX INTL-110 remove utf8 BOMeli
2013-01-07FIX INTL-110 fix corrupted chinese character in translationeli
2013-01-07merge with headcallum_linden
2013-01-04merge back DRTVWR-275 from 3.4.4 betaOz Linden
2013-01-03MAINT-2184 [crashhunters] new crash in LLUUID::toStringKelly Washington
Fix dangling references.
2013-01-02merge changes for DRTVWR-269Oz Linden
2012-12-28merge changes for DRTVWR-272Oz 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.
2012-12-20merge changes for 3.4.4-beta3Oz Linden
2012-12-20merge changes for DRTVWR-271Oz Linden
2012-12-20Reverted mac updaterAura Linden
2012-12-20There goes a month of workAura Linden
2012-12-19merge changes for 3.4.4-beta2Oz Linden
2012-12-19merge changes for DRTVWR-270Oz Linden
2012-12-19Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2012-12-19MAINT-1986: merge in TeamCity check in hashmap_testNat Goodspeed
2012-12-19MAINT-1986: merge in server-trunk fixesNat Goodspeed
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 19:16:54 +0000