Commit Graph

26091 Commits (fa822a2ae50f8d070da19c64b3b3c03643d7c8b2)

Author SHA1 Message Date
William Todd Stinson fa822a2ae5 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-12-13 11:17:07 -08:00
Gilbert Gonzales 177737fa34 merging in latest changes 2012-12-13 09:14:51 -08:00
AlexanderP ProductEngine be6f3286f4 Fixed path for correct assembly of the project 2012-12-13 18:43:52 +02:00
William Todd Stinson 5df9d52d48 CHUI-499: Refactoring the persistent notification storage so that I can reuse the functionality for do-not-disturb mode. 2012-12-12 18:49:07 -08:00
Gilbert Gonzales b6f3c4d07e CHUI-526: Slight bug fix. Problem was that the 'Teleport Offer' sound was turn on by default when the user cleared their settings. Resolution: Inside settings.xml changed the PlaySoundTeleportOffer to no longer have an intial value of 1 (true). Now it is 0 (false). 2012-12-12 18:02:13 -08:00
Gilbert Gonzales 37e95e8379 CHUI-545: Minor logic fix, inside ::switchIndicator(), make sure that in the case that the parent is visible and the parent makes the visibility changes...that mIndicatorToggled becomes false because the parent has already made the visiblity changes. 2012-12-12 17:43:15 -08:00
Gilbert Gonzales 2a9056f0b7 merging in latest changes 2012-12-12 17:00:35 -08:00
Gilbert Gonzales 89671fa1ad CHUI-545: Adjusted fix because the old implementation of ::switchIndicator was not very clean and relied on the visiblity of the OutputMonitorCtrl to have a visibility of true even when it wasn't. The fix implemented makes it so that the visibility of OutputMonitorCtrl is always correct and the parent of this ctrl can use this information to adjust children adjacent to OutputMonitorCtrl. 2012-12-12 16:59:57 -08:00
William Todd Stinson 5b827d58f6 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-12-12 14:24:09 -08:00
William Todd Stinson a88de5d45f Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge. 2012-12-12 13:16:45 -08:00
William Todd Stinson 0a16fc53cf Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-merge. 2012-12-12 12:53:24 -08:00
William Todd Stinson 78b7a4b37c Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-12-12 12:48:59 -08:00
Gilbert Gonzales e7a912816e mergining in latest changes 2012-12-12 10:40:47 -08:00
AlexanderP ProductEngine 4c20cc3e46 CHUI-584 : Addit. fix : Viewer crash when clicking on view/sort options drop down in conversation floater:
Cancelled unconditional receiving a instance of the floater (LLFloaterReg::getInstance()) from LLFloaterIMContainer::selectConversationPair(), because in some situations this method is called from LLFloaterIMNearbyChat::postBuild() - In other words, while the unfinished process of creation of this floater
2012-12-12 18:53:06 +02:00
AlexanderP ProductEngine 322fb00630 CHUI-584 : Fixed : Viewer crash when clicking on view/sort options drop down in conversation floater:
Protection from a lack of the current selection. It need for the newly created floater, which still is not finished adding the first conversation item.
2012-12-12 19:05:40 +02:00
AlexanderP ProductEngine 9275379e3c CHUI-584 : WIP : Viewer crash when clicking on view/sort options drop down in conversation floater:
Renaming of local vfriables in accordance with the code convention
2012-12-12 18:59:24 +02:00
maxim@mnikolenko 3d7aaaada8 CHUI-427 FIXED Added callback to track changing in mUserPTTState. It's needed to synchronize both buttons 2012-12-12 13:14:52 +02:00
William Todd Stinson 3636b10d47 CHUI-494: Removing the creation of a new session while receiving an IM in DND mode. 2012-12-11 20:46:10 -08:00
William Todd Stinson 79cb158e11 Removing cruft code. 2012-12-11 20:03:05 -08:00
William Todd Stinson b5db495259 CHUI-494: Toggling the behavior of the communication notification channel filter as it should be true when not in DND mode and false when in DND mode. 2012-12-11 18:48:29 -08:00
Gilbert Gonzales b4e738e503 merging in latest changes 2012-12-11 17:51:00 -08:00
Gilbert Gonzales 34558181c7 CHUI-545: Problem: Sometimes the speaker indicator icons were not visible in the conversations panel. Resolution: The problem was that the visibility was set incorrectly. When the speaking indicator was not in the visible chain the state of the visiblity would be stored in a pending variable. If the visiblity changed before the pending variable was used, then this meant the pending variable overrode the most recent visibiltiy changes. So as a solution, if the visiblity changes then prevent the pending visiblity from being used. 2012-12-11 17:49:43 -08:00
William Todd Stinson d3027ffb8f Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-12-11 17:41:00 -08:00
MaximB ProductEngine 8037b43588 merge 2012-12-12 03:06:10 +02:00
MaximB ProductEngine 80bc7e13e1 CHUI-557 (Cannot expand conversation from minimized state by clicking on selected conversation) 2012-12-12 03:05:32 +02:00
maxim@mnikolenko 13956ab25d CHUI-572 FIXED Changed initial position for floaters according to screenshot. 2012-12-11 17:16:32 +02:00
maxim@mnikolenko 6b1ab1b81c CHUI-587 FIXED Disable menu item if "KeepConversationLogTranscripts" is false. 2012-12-11 15:20:46 +02:00
William Todd Stinson 4d3590ae9c Correcting a mac build error. 2012-12-10 19:14:37 -08:00
MaximB ProductEngine 0e4c3070cb merge 2012-12-10 22:48:12 +02:00
Oz Linden a334f41f8e Added tag 3.4.3-release for changeset 5cba5f39d0a8 2012-12-10 15:24:49 -05:00
Oz Linden 623a06aabd merge release tag 2012-12-10 15:24:08 -05:00
William Todd Stinson 3c591c1a92 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-12-10 10:32:33 -08:00
MaximB ProductEngine f49d47b304 CHUI-394 (Group moderation tools missing in right click menus) 2012-12-10 17:22:56 +02:00
maxim@mnikolenko 08a7f4193b CHUI-457 FIXED Brought back the checking 2012-12-10 15:30:46 +02:00
Merov Linden 53471178fe CHUI-509, CHUI-585 : Fixed : Add font color parameters to received items and other inventory elements created 2012-12-07 20:06:30 -08:00
Merov Linden 79b44fa561 Pull merge from richard/viewer-chui 2012-12-07 19:00:35 -08:00
Merov Linden a6f1690128 CHUI-580, CHUI-406 : Fixed : Finished avatar name caching, also fixed the display of (waiting) when names don't come (mostly in legacy mode). 2012-12-07 18:58:52 -08:00
Gilbert Gonzales b1b4b78d5c CHUI-417: Problem: Speaking indicator icons were out of position because they were not taking into account the reduced width when a vertical scrollbar appeared. Resolution: Now when the ::arrange() function is called, this implies that the width of a conversation line item has changed...so within this function call updateChildren(). updateChildren() will reposition the speaker icon and info button based upon the adjusted width. 2012-12-07 17:38:36 -08:00
Gilbert Gonzales 2965cdf5db CHUI-579: Found a small bug in my last commit causing nearby chat im's to show two toast messages. Now the upper right toast (im toasts) will only show when the session id is non NULL (Nearby chat has a session value that is NULL). 2012-12-07 15:03:12 -08:00
Gilbert Gonzales 5400b817e8 merging in latest changes 2012-12-07 14:44:52 -08:00
Gilbert Gonzales 0037b1e2c7 CHUI-579: Post code review. Renamed variables to make easier to read. 2012-12-07 14:44:15 -08:00
Gilbert Gonzales dd030f1b75 merging in latest changes 2012-12-07 10:25:39 -08:00
maksymsproductengine cd20d3dc2b CHUI-512 FIXED New incoming conversations take focus in message panel only and do not show toasts 2012-12-07 19:56:16 +02:00
AlexanderP ProductEngine 6122f000cb CHUI-547 : Fixed : (Clicking IM toast does not select message panel in conversation floater) : select new session floater when a container is hidden 2012-12-07 17:43:05 +02:00
AlexanderP ProductEngine fb5417b716 CHUI-564 : Fixed : (Conversation floater always opens when new IM is received) : Remove obsolete code: control of an visibility of container was delegated to on_new_message() [see llimview.cpp] 2012-12-07 17:53:17 +02:00
maxim@mnikolenko 979360340f CHUI-530 FIXED Changed selectConversation() to reSelectConversation() 2012-12-07 15:42:33 +02:00
AlexanderP ProductEngine b3e667cc0e CHUI-582 : fixed : Resizing conversation floater initially only resizes conversation list width. 2012-12-07 15:13:26 +02:00
maxim@mnikolenko 935b332625 CHUI-427 FIXED Voice button is added to Conversations floater. 2012-12-07 15:03:32 +02:00
Merov Linden bb322a1ccc CHUI-580 : Fixed : Clean up the use of display name. Allow the use of the legacy protocol in settings.xml 2012-12-07 00:10:50 -08:00
William Todd Stinson 9da625d439 CHUI-494: WIP First pass at getting the suppression of events in DND working. 2012-12-06 20:28:25 -08:00