summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsession.cpp
AgeCommit message (Expand)Author
2016-04-04merge with 4.0.3-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-05-22Floater IM Session to trivial coroutine.Rider Linden
2014-10-18Update to build on Xcode 6.0: clang fix for bracketed logical operationscallum_linden
2014-06-18Merge downstream codesimon
2014-06-10MAINT-4135 FIXED Text input field is not disabled in group chat window for us...andreykproductengine
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 occ...MaximB ProductEngine
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
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
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 ex...Mnikolenko ProductEngine
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 a...Gilbert Gonzales
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 wh...Mnikolenko ProductEngine
2013-03-15CHUI-830 FIXED Button for collapsing torn-off floater(to a single input line)...Mnikolenko ProductEngine
2013-03-13Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile f...Don Kjer
2013-03-11Viewer-chui mergeprep
2013-02-01CHUI-675 FIX You can select multiple users in people floater but can only dra...Cho
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 Cons...Cho