summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-01-30merge downstream code from viewer-lionsimon@Simon-PC.lindenlab.com
2013-01-30Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2013-01-29pull back more 3.4.5 beta fixesOz Linden
2013-01-29merge changes for MAINT-2276Oz Linden
2013-01-29MAINT-2281: correct test for XP (corrected fix I applied incorrectly)Oz Linden
2013-01-29MAINT-2288 Fix for physics shapes not showing up on "active" objects.Dave Parks
2013-01-28For MAINT-2276 a workaround to unblock 3.4.5 beta review: tedGraham Madarasz (Graham)
2013-01-26[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate entry from panel_preferences_general.xml
2013-01-25Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-01-25MAINT-2268 Add right-click->"Mute Particle Owner" featureDave Parks
2013-01-25MAINT-2268 Add right-click->"Mute Particle Owner" featureDave Parks
2013-01-25[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate notification elements
2013-01-29MAINT-2281: correct test for XPcallum_linden
2013-01-25merge changes for MAINT-2275, MAINT-2277Oz Linden
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-22pull back fix for MAINT-2242Oz Linden
2013-01-22MAINT-2158 - Particle grievance. Particles are not added at less than 4 fps.simon@Simon-PC.lindenlab.com
Reviewed by Kelly
2013-01-22merge changes for DRTVWR-287Oz Linden
2013-01-22Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-01-22MAINT-2252 GPU Table updateDave Parks
2013-01-18merge changes for MAINT-2247Oz Linden
2013-01-17MAINT-1514 Viewer crashes while user trying to invite all friends to the groupKelly Washington
* Enforce 100 max invites at the 'add to list' stage instead of only at 'sent to server' * Cache the IDs in the list locally to avoid horrible performance pattern
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-15merge changes for DRTVWR-284Oz Linden
2013-01-15merge changes for DRTVWR-282Oz Linden
2013-01-14MAINT-2223 FIX Scroll list columns resize feature brokenRichard Linden
column dirty flag was not set when user resized a column
2013-01-14Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2013-01-14merge changes for 3.4.5-beta2Oz Linden
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-11Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
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-10increment viewer version to 3.4.6Oz Linden
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. Pull viewer-development in prior to filing DRTVWR merge request.Monty Brandenberg