summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsession.cpp
AgeCommit message (Collapse)Author
2024-03-12Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
DRTVWR-600-maint-A # Conflicts: # autobuild.xml # indra/llrender/llfontbitmapcache.cpp # indra/llrender/llfontbitmapcache.h # indra/llrender/llfontfreetype.cpp # indra/llrender/llfontfreetype.h # indra/llrender/llfontgl.cpp # indra/llrender/llfontgl.h # indra/llui/llbutton.h # indra/llui/llfloater.cpp # indra/llui/llfloater.h # indra/llui/llfolderviewitem.cpp # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/llscrollcontainer.cpp # indra/llui/llscrollingpanellist.cpp # indra/llui/llscrollingpanellist.h # indra/llui/llscrolllistctrl.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llui/lluictrl.cpp # indra/llui/llview.cpp # indra/llui/llview.h # indra/newview/llchicletbar.h # indra/newview/llconversationlog.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterimsessiontab.h # indra/newview/llfloateruipreview.cpp # indra/newview/llnavigationbar.h # indra/newview/llpaneltopinfobar.h # indra/newview/llpathfindingpathtool.h # indra/newview/lltextureview.cpp # indra/newview/lltoolbrush.h # indra/newview/lltoolcomp.h # indra/newview/lltooldraganddrop.h # indra/newview/lltoolface.h # indra/newview/lltoolfocus.h # indra/newview/lltoolindividual.h # indra/newview/lltoolobjpicker.h # indra/newview/lltoolpie.h # indra/newview/lltoolpipette.h # indra/newview/lltoolselectland.h # indra/newview/llviewermediafocus.h # indra/newview/llviewerparcelmediaautoplay.h # indra/newview/llviewerwindow.cpp # indra/newview/llvoicechannel.h # indra/newview/llvoicevivox.h # indra/newview/llworldmapview.cpp
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2023-08-30SL-20210 Recent Emojis - Remember emojis that were actually sent in the messageAlexander Gavriliuk
2022-08-17SL-17973 FIXED region name is not shown in the IM chatMnikolenko Productengine
2021-01-21SL-14728 Im session without id should be closableAndrey Kleshchev
2018-04-10MAINT-8489 Remove/Cleanup LLIMInfoAndrey Kleshchev
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
Changed debugging output from core utitl to string.
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 ↵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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 19:47:10 +0000