summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsession.cpp
AgeCommit message (Collapse)Author
2014-06-18Merge downstream codesimon
2014-06-10MAINT-4135 FIXED Text input field is not disabled in group chat window for ↵andreykproductengine
user who cannot enter text chat
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-02-12merge with releaseRichard Linden
2014-02-11mergeBrad Payne (Vir Linden)
2014-02-10Merge downstream code with viewer-releasesimon
2013-12-05mergeBrad Payne (Vir Linden)
2013-11-28MAINT-3334 (If a chat tab is in focus when you enter mouselook, chat that ↵MaximB ProductEngine
occurs while in mouselook does not display after exiting mouselook)
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-11merge changes for 3.6.10-releaseOz Linden
2013-10-30STORM-1975 Changed timeout constants toJonathan Yap
ME_TYPING_TIMEOUT = 4.0 OTHER_TYPING_TIMEOUT = 9.0
2013-10-29STORM-1975 Convert old-style debugging lines to new-styleJonathan Yap
2013-10-29STORM-1975 IM windows occasionally report false typing status.Jonathan Yap
2013-09-09merge with viewer-releaseRichard Linden
2013-09-04mergeBrad Payne (Vir Linden)
2013-09-13Build fix after patch for MAINT-3137dmitrykproductengine
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-06-20merge with releaseRichard Linden
2013-06-06CHUI-973 FIXED Speaking indicator was removedMnikolenko ProductEngine
2013-06-05merge with viewer-releaseRichard Linden
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-21mergeBrad Payne (Vir Linden)
2013-05-13CHUI-944 FIXED Show Voice indicator for P2P torn off conversations.Mnikolenko ProductEngine
2013-05-02Pull from viewer-releaseMerov Linden
2013-04-25CHUI-934 FIXED Do not add to vector if session is closed to avoid crash.Mnikolenko ProductEngine
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-12CHUI-934 FIXED Don't try to close Session floater if it is already doesn't ↵Mnikolenko ProductEngine
exist.
2013-04-05mergeNyx Linden
2013-04-02Merged in chui beta code.prep@lindenlab.com
2013-04-02pulling in sunshine-stable to sunshine-internal.Nyx Linden
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-03-29Merged in Chui beta6+ fixesprep@lindenlab.com
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-27CHUI-901 : Fixed! Do touch torn off state in restoreFloater()Merov Linden
2013-03-21Folded in changes from sunshine-stableprep
2013-03-20Merge with viewer-chuiprep@lindenlab.com
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-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-13Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile ↵Don Kjer
failures
2013-03-11Viewer-chui mergeprep
2013-02-01CHUI-675 FIX You can select multiple users in people floater but can only ↵Cho
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-01-29merging latest changesCho
2013-01-29merging latest changesCho
2013-01-29CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication ↵Cho
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-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-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
2013-01-15CHUI-458 : Fixed : Tidy up the title overwrite by the selected conversationMerov Linden