summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimcontainer.cpp
AgeCommit message (Collapse)Author
2013-11-12BUILDFIX - miscellaneous stuff missed in the mergeRichard Linden
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-06merge with releaseRichard Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-09-19Merge with bitbucket.org/msavchenko/viewer-release-maint-3132maksymsproductengine
2013-09-12MAINT-3134 keep chat from opening in response to key confirm on quit dialog, ↵Graham Madarasz (Graham Linden)
fix mac-only sketchy precedence warning, and re-re-re-re-re-remove patch file that simply will not die.
2013-09-09merge with viewer-releaseRichard Linden
2013-08-28merging viewer releaseGilbert Gonzales
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-08-21MAINT-3020 ([CHUI] Torn off nearby chat is no longer visible after exiting ↵mberezhnoy
mouselook)
2013-10-23Merge latest viewer-release with FBCsimon
2013-08-23MAINT-3031: Toggle Expanding CHUI when Icon is CLickedPavelK ProductEngine
2013-09-06MAINT-3030 [CHUIBUG]Conversations pane has alignment issues when collapsedPavelK ProductEngine
2013-09-19Merge downstream codesimon_linden
2013-09-13MAINT-3133 FIXED Expand Nearby Chat participant list on first open of ↵dmitrykproductengine
Conversations floater, per login session
2013-09-12MAINT-3137 FIXED We should handle condition when viewer is quittingMnikolenko ProductEngine
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-06-27CHUI-817 FIX Revealing the "Conversations" window reveals hidden Nearby Chat ↵PavelK ProductEngine
window as well
2013-07-17CHUI-987 FIXED (Viewer crashes when you try drag and drop any object from ↵Mnikolenko ProductEngine
inventory onto avatar’s name in resident picker)
2013-06-19merge changes for 3.6.0-releaseOz Linden
2013-06-19Pull merge from lindenlab/viewer-releaseMerov Linden
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-06-13merge changes for 3.5.3-releaseOz Linden
2013-06-11CHUI-926 FIXED FUI button will stay highlight(orange) if there are unread ↵Mnikolenko ProductEngine
IMs when the conversation floater is minimized.
2013-06-07CHUI-953 (Viewer does not quit after confirming to quit first time)mberezhnoy
Added missing "else" statement
2013-06-07mergemberezhnoy
2013-06-05STORM-1838 Slowly reappling changes to work with CHUIJonathan Yap
2013-06-05CHUI-953 (Viewer does not quit after confirming to quit first time)mberezhnoy
removed DND hack
2013-06-04CHUI-918 FIXED Close only selected conversations instead of closing all ↵Mnikolenko ProductEngine
conversations.
2013-05-29CHUI-915 ([CHUIBUG]Control+W hides Conversations floater instead of closing ↵mberezhnoy
active tab)
2013-05-29CHUI-918 FIXED "Close all conversations" menu item is added to context menu.Mnikolenko ProductEngine
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-20CHUI-953 FIXED Set dnd and close all conversation before quittinq.Mnikolenko ProductEngine
2013-05-16CHUI-963 (Toggling chat fui button twice tears off nearby chat to lower left ↵mberezhnoy
corner also deletes other open conversations)
2013-05-03CHUI-963 (Toggling chat fui button twice tears off nearby chat to lower left ↵mberezhnoy
corner also deletes other open conversations)
2013-05-02ACME-306 : Pull merge from viewer-chuiMerov Linden
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30CHUI-953 FIXED Close conversation floater when quitting viewerMnikolenko ProductEngine
2013-04-29CHUI-956 FIXED Vertical scrollbar in conversation list not scrolls off bottommaksymsproductengine
2013-04-26CHUI-859 FIXED Conversation panel moves when new message received with Open ↵maksymsproductengine
Conversation window preference
2013-04-23Pull merge from lindenlab/viewer-chuiMerov Linden
2013-04-23CHUI-943 FIXED "Chat history" menu item is added to context menu for Nearby ↵Mnikolenko ProductEngine
chat.
2013-04-22Pull merge from lindenlab/viewer-chuiMerov Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-17CHUI-933 FIXED No notification of IMs when coming out of Do Not Disturb mode ↵PavelK ProductEngine
with Flash Toolbar button preference
2013-04-19mergemberezhnoy