summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimnearbychat.cpp
AgeCommit message (Collapse)Author
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-07merge changes for DRTVWR-333Oz Linden
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
Initial change made LLControlVariable::mPersist an enum, but retained bool/BOOL public API. setPersist(true) set one value, setPersist(false) set another, forcePersist() set the third. Per code review, expose enum to public, make setPersist() (and LLControlVariable constructor, and LLControlGroup:: declareControl(), and all the LLControlGroup::declareMumble() methods, and all the unit-test dummy declareMumble() method bodies) accept that enum. Remove forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly. Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-06-27CHUI-817 FIX Revealing the "Conversations" window reveals hidden Nearby Chat ↵PavelK ProductEngine
window as well
2013-06-26CHUI-983 FIXED Call showHistory() after clicking toast as it was before. ↵Mnikolenko ProductEngine
Minor change in showHistory()
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-06-17merge changes for 3.6.0-releaseOz Linden
2013-05-30CHUI-971 FIXED Unnecessary checking was removed.Mnikolenko ProductEngine
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-20merge changes for 3.5.2-releaseOz Linden
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-10CHUI-932 FIXED Restore previous text only if there is no gesture.Mnikolenko ProductEngine
2013-04-08CHUI-914 FIXED Restore previous text after gestures were triggered.Mnikolenko ProductEngine
2013-04-01CHUI-796 (User doesn't get all messages in 'do not disturb' mode): Now when ↵Gilbert Gonzales
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-01CHUI-904 FIXED Set the focus on the Nearby chat floater after setting ↵Mnikolenko ProductEngine
visibility.
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28merge changes for 3.5.0-beta6Oz Linden
2013-03-27mergeGilbert Gonzales
2013-03-27CHUI-851 ([CHUIBUG]Focussing issue and unresponsive tabs when focus is ↵Gilbert Gonzales
brought back to the HUB): Now when pressing enter a docked nearby chat floater will be focused and the conversation line item will be selected. When the nearby chat is not docked then only the floater will be focused.
2013-03-27CHUI-893 ([CHUIBUG]Chat input field scrambles "/nod")mberezhnoy
2013-03-25merge changes for storm-1931Oz Linden
2013-03-22CHUI-879 FIXED Expand and then collapse message pane when floater opens to ↵Mnikolenko ProductEngine
avoid UI issues.
2013-03-20CHUI-873 FIXED [CHUIBUG]Torn off nearby chat with message panel hidden has ↵maksymsproductengine
huge bottom padding when opening in mouselook mode
2013-03-20merge changes for storm-1931Oz Linden
2013-03-20CHUI-869 FIXED Clicking on toast will restore Message pane.Mnikolenko ProductEngine
2013-03-18CHUI-620 FIXED Clear the highlight when auto-selecting new conversation or ↵Mnikolenko ProductEngine
when text is entered into the message panel.
2013-03-15CHUI-816 [CHUIBUG]CHUI does not remember undocked state and position of ↵AlexanderP ProductEngine
Nearby Chat
2013-03-15CHUI-830 FIXED Button for collapsing torn-off floater(to a single input ↵Mnikolenko ProductEngine
line) is added. Show toasts for new messages for that conversation, regardless of other prefs.
2013-03-13CHUI-816 [CHUIBUG]CHUI does not remember undocked state and position of ↵AlexanderP ProductEngine
Nearby Chat : canceled the erroneous torn-off/docked state saving when nearby chat is closes
2013-03-08CHUI-835 (ctrl-h does not select nearby chat conversation in list): Modified ↵Gilbert Gonzales
setVisibleAndFrontMost() to now take a arguement for the key that was pressed (if one was pressed). This allows the floater to select the converation line item when becoming visible/frontmost.
2013-03-05CHUI-815 FIXED Handle SHIFT+ENTER to whisper in Nearby chatMnikolenko ProductEngine
2013-03-01CHUI-694 FIXED Handle ALT + Up/Down and ALT + Right/Left to switch ↵Mnikolenko ProductEngine
conversations in the list. Handle ALT + Enter to expand participant list of selected conversation.
2013-02-23CHUI-568 : Fixed! Implemented Ctrl-H for Nearby Chat, taking into account ↵Merov Linden
the existence of other conversations and docked/torn off state
2013-02-22STORM-1931: Added option to disable chat animations (say/whisper/shout)Ansariel
2013-02-21CHUI-568 : WIP : Introduced Ctrl-T and Ctrl-H for conversations and nearby chatMerov Linden
2013-02-06CHUI-744 FIXED KeepConversationLogTranscripts setting is moved to ↵Mnikolenko ProductEngine
settings_per_account.xml
2013-02-06CHUI-716 FIXED Call onClickCloseBtn() to avoid complete disappearing of torn ↵Mnikolenko ProductEngine
off Nearby chat.
2013-01-29merging latest changesCho
2013-01-29merging latest changesCho
2013-01-25CHUI-291 FIX New auto-replace feature does not work with chui text input ↵Cho
boxes in conversation floater Modified LLAutoReplace to pass back a string for replacement instead of modifying the input string
2013-01-25CHUI-291 FIX New auto-replace feature does not work with chui text input ↵Cho
boxes in conversation floater Fixed autoreplace in LLTextEditor so it updates correctly and works with undo
2013-01-24CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tabmaksymsproductengine
2013-01-23CHUI-291 FIX New auto-replace feature does not work with chui text input ↵Cho
boxes in conversation floater Moved autoreplace hooks from LLLineEditor to LLTextEditor, and modified LLAutoReplace accordingly
2012-12-15CHUI-591 FIXED Issues with resizing conversations floatermaksymsproductengine
2012-12-05Pull merge from dev repoMerov Linden
2012-12-05CHUI-580 : WIP : Change the display name cache system, deprecating the old ↵Merov Linden
protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-04CHUI-571: Fixed bug where when the converation floater was torn off and a ↵Gilbert Gonzales
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-11-28CHUI-552 : Fixed : Do not update the avatars sorting when updating the ↵Merov Linden
speaking indicator, let the conversation list do that.