summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-01-15CHUI-668: Code review changesGilbert Gonzales
2013-01-15merge changes for DRTVWR-284Oz Linden
2013-01-15Merge with lindenlab/viewer-chuiMerov Linden
2013-01-15CHUI-458 : Fixed : Tidy up the title overwrite by the selected conversationMerov Linden
2013-01-15merging in latest changesGilbert Gonzales
2013-01-15merge changes for DRTVWR-282Oz Linden
2013-01-15CHUI-567 FIXED "Translate chat", "Translation settings..." menu items are added.maxim@mnikolenko
2013-01-14CHUI-668: The user's most intrusive notification is not used anymore when ↵Gilbert Gonzales
coming out of DND mode with IMs. Adjusted code to just open the converseation floater (which was changed also in a prior fix by PE).
2013-01-14CHUI-458 : WIP : Allow change of the general conversations panel when the ↵Merov Linden
selected conversation needs it (e.g. P2P is typing)
2013-01-14mergemaximbproductengine
2013-01-14CHUI-662 (Multi select across conversations can result in (???) (???) in the ↵maximbproductengine
conversation list)
2013-01-14merging latest changesGilbert Gonzales
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-11MAINT-417 Backed out changeset: 7273a1ac51e8Dave Parks
2013-01-11Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2013-01-11MAINT-1481: Remove xmenity script and viewer_manifest.py references.Nat Goodspeed
2013-01-10Merge pull from lindenlab/viewer-betaMerov 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-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-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-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-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
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08CHUI-611 Fixed! Text in torn off message panel not wrapping correctly with ↵AlexanderP ProductEngine
size of conversation panel
2013-01-08remove duplicated return (merge artifact)Oz Linden
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-08CHUI-602 FIXED Return false if Selected view model item is null.maxim@mnikolenko
2013-01-07CHUI-659 : WIP : Clamp down on the number of rearrange we really need.Merov Linden
2013-01-07CHUI-659 : WIP : Clean up typos in my own commentsMerov Linden