Commit Graph

35 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Nyx Linden 3e53ade13e merge 2013-04-05 15:24:22 -04:00
prep@lindenlab.com ef6242d729 Merged in chui beta code. 2013-04-02 17:15:48 -05:00
Nyx Linden 323a2f2235 pulling in sunshine-stable to sunshine-internal. 2013-04-02 16:02:13 -04:00
Gilbert Gonzales b37f501a87 CHUI-796 (User doesn't get all messages in 'do not disturb' mode): Now when a conversation is focused by clicking on it's line item, selecting a torn off floater or unminimized a torn off floater the stored notifications for that conversation will be removed. 2013-04-01 15:36:05 -07:00
prep@lindenlab.com 0f24668b0a Merged in Chui beta6+ fixes 2013-03-29 10:37:58 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Merov Linden 9f819806cd CHUI-901 : Fixed! Do touch torn off state in restoreFloater() 2013-03-27 16:08:03 -07:00
prep f345746161 Folded in changes from sunshine-stable 2013-03-21 11:21:45 -04:00
prep@lindenlab.com f2948cb1eb Merge with viewer-chui 2013-03-20 17:53:51 -05:00
Mnikolenko ProductEngine bc8ac5854f CHUI-620 FIXED Clear the highlight when auto-selecting new conversation or when text is entered into the message panel. 2013-03-18 14:37:21 +02:00
Mnikolenko ProductEngine ee4fbb8e37 CHUI-830 FIXED Button for collapsing torn-off floater(to a single input line) is added.
Show toasts for new messages for that conversation, regardless of other prefs.
2013-03-15 12:33:46 +02:00
Don Kjer 662d67e3b5 Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures 2013-03-13 08:46:59 +00:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Cho 56b158e486 CHUI-675 FIX You can select multiple users in people floater but can only drag and drop one name to conversation
Moved drag and drop start in LLAvatarListItem instead of LLAvatarList, and made LLFloaterIMSession handle multiple dropped participants correctly
2013-02-01 18:54:15 +00:00
Cho acd28e28bc merging latest changes 2013-01-29 00:19:29 +00:00
Cho f9d44737b7 merging latest changes 2013-01-29 00:19:05 +00:00
Cho 44b681f5db CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication Console Immediately.
Removed new code from on_new_message in LLIMView and instead, changed condition in LLFloaterIMSession::newIMCallback to update messages whenever the floater is visible
2013-01-29 00:16:40 +00:00
Cho 163f3de73d CHUI-291 FIX New auto-replace feature does not work with chui text input boxes in conversation floater
Modified LLAutoReplace to pass back a string for replacement instead of modifying the input string
2013-01-25 19:53:12 +00:00
maksymsproductengine 2ac99f55f9 CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tab 2013-01-24 19:56:13 +02:00
Cho 977d318ac8 CHUI-291 FIX New auto-replace feature does not work with chui text input boxes in conversation floater
Moved autoreplace hooks from LLLineEditor to LLTextEditor, and modified LLAutoReplace accordingly
2013-01-23 20:22:28 +00:00
Merov Linden 235a347736 CHUI-458 : Fixed : Tidy up the title overwrite by the selected conversation 2013-01-15 14:13:36 -08:00
Merov Linden cefcdd445b CHUI-458 : WIP : Allow change of the general conversations panel when the selected conversation needs it (e.g. P2P is typing) 2013-01-14 15:26:59 -08:00
maxim@mnikolenko d05df4087c CHUI-617 FIXED Update Gear button state after initing session.
mConversationsRoot creation is moved to postBuild().
2012-12-26 11:46:29 +02:00
Gilbert Gonzales 13a619cb5f CHUI-385: Problem: When the new session was created with multiple participants the old conversation floater was being recycled. When the conversation floater was re-initialized it did not remove and update the chat messages. Resolution: When the conversation floater is recycled simply call reloadMessages(). 2012-12-18 18:15:28 -08:00
maxim@mnikolenko 6b165ce2ad CHUI-562 FIXED Gear button is added for p2p torn-off floater. 2012-12-18 15:09:50 +02:00
Gilbert Gonzales 68b61bdec6 CHUI-520: Now when have a P2P conversation torn off a voice indicator icon will be displayed allowing the user to adjust the voice volume when clicked. Also did a code cleanup on conversationview.h/cpp which was showing the speaking indicator icon too soon when joining another voice session. This was due to calling switchIndicator(..) directly inside ::onCurrentVoiceSessionChanged. The proper solution is to wait for SpeeakingIndicatorManager::switchSpeakerIndicators() call switchIndicators(). 2012-12-14 16:01:14 -08:00
Gilbert Gonzales 7b47f8e3dd merging in latest changes 2012-12-04 19:24:14 -08:00
Gilbert Gonzales 8642088d65 CHUI-571: Fixed bug where when the converation floater was torn off and a new im received, the incorrect conversation would be displayed and focused. In order to do this removed the conversation floater panels from being focused immediately when set visible. Also there was a bug when showing the stub panel for torn off conversations. The tab container was not setting the stub panel index properly to 0, which is where the stub panel existed in the tab container's list. This is post code review submit. Will submit another with minor code review changes. 2012-12-04 19:23:36 -08:00
maksymsproductengine f1155c4fa5 CHUI-573 FIXED Notification chiclet shown when object chiclets are shown 2012-12-04 04:14:51 +02:00
Merov Linden eab0ec402e CHUI-570 : Delete a stray debug comment log. 2012-11-30 14:34:23 -08:00
Merov Linden 47a1a04681 CHUI-570 : Fixed : Take the typing state when updating the title, also make refresh update less frequent (perf). 2012-11-30 14:12:46 -08:00
AlexanderP ProductEngine 29e9f792bb CHUI-512 FIXED (New incoming conversations take focus in message panel only and do not show toasts). Rejected update message when floater hasn't focus 2012-11-13 21:20:05 +02:00
AlexanderP ProductEngine 486bdf3284 CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00