summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-01-14CHUI-662 (Multi select across conversations can result in (???) (???) in the ↵maximbproductengine
conversation list)
2013-01-14merging latest changesGilbert Gonzales
2013-01-14merge changes for 3.4.5-beta2Oz Linden
2013-01-14merge changes for DRTVWR-283Oz Linden
2013-01-11CHUI-668: Now when exiting DND mode, the user's most intrusive notification ↵Gilbert Gonzales
will be used to notify that user (if received IM's during DND mode). Nearby chat messages/settings are ignored.
2013-01-11CHUI-668: Not fully complete but as of this commit, have functionality to ↵Gilbert Gonzales
use the user's most intrusive chat notification upon exiting from DND mode with IM's. Also if in DND mode, clicking on a conversation line item or floater, will flush the DND notifications system of storing that conversation. This way upon existing DND mode already responded conversations won't be notified to the user.
2013-01-12CHUI-618 ADD FIX User sees no indication of offline messages received with ↵AlexanderP ProductEngine
conversation log preference turned off: changed in accordance with a new requirements (open conv. floater instead flashing)
2013-01-11pull from richard/viewer-chuiMerov Linden
2013-01-11CHUI-650 : Revert : revert the change as it creates infinite recursive callsMerov 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-11CHUI-650 FIXED Set focus to floater when bringToFront() is called(even if ↵maxim@mnikolenko
it's already in front).
2013-01-10CHUI-672 : Fixed : LLMultiFloater members need to be initialized in constructor.Merov Linden
2013-01-10increment viewer version to 3.4.6Oz Linden
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2013-01-10merge changes for DRTVWR-280Oz Linden
2013-01-10Pull merge from richard/viewer-chuiMerov Linden
2013-01-10CHUI-649 : Fixed : Added the contextual menu to in build content tabMerov Linden
2013-01-10MAINT-2209 Parcel name not updating after teleportKelly Washington
2013-01-10mergemaximbproductengine
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-10CHUI-663 (Right click menus on participants inactive in conversation floater ↵maximbproductengine
for torn off conversation)
2013-01-09CHUI-649 : WIP : Cleanup code to make it readableMerov Linden
2013-01-09Pull merge from richard/viewer-chuiMerov Linden
2013-01-09CHUI-652 : Fixed : Maintain multi selection consistent when click and drag ↵Merov Linden
an already selected item (drag multi select was broken)
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-09CHUI-670: Prevent flashing of 'Chat' FUI button while in DND mode and ↵Gilbert Gonzales
receive IM.
2013-01-09Merge. Pull viewer-development in prior to filing DRTVWR merge request.Monty Brandenberg
2013-01-09CHUI-669: Upon DND mode exit, no longer flash IM messages that were stored ↵Gilbert Gonzales
during DND mode.
2013-01-09CHUI-652 : Fixed : Skip the bogus fetching test when adding objects to ↵Merov Linden
object content.
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-09CHUI-638 FIXED Don't force button and widget to flash if the object is muted.maxim@mnikolenko
2013-01-09CHUI-665 (Change "Open conversation log" to "Conversation log..." in ↵maximbproductengine
communication floater view/sort menu)
2013-01-08Merge pull from richard/viewer-chuiMerov Linden
2013-01-08CHUI-659 : Fixed : Reimplemented open selection on hitting return the right wayMerov Linden
2013-01-08CHUI-660: Post code review changesGilbert Gonzales
2013-01-08CHUI-612 FIXED Blank conversation names showing in conversation listmaksymsproductengine
2013-01-10CHUI-658 FIXED Don't highlight whole content of the folder after right ↵maxim@mnikolenko
clicking if it is flashing.
2013-01-08CHUI-660: Problem: Upon auto-existing DND mode upon startup, the ↵Gilbert Gonzales
notification form elements (buttonts) were added to the form. But then deserialized form elements were also being added to the form causing duplicate buttons. As a solution, only add on the deserialized form elements that exceed the amount in the template.
2013-01-08merge changes for DRTVWR-277Oz Linden