summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
AgeCommit message (Collapse)Author
2014-05-07Merge downstream version 3.7.8 codesimon
2014-03-14MAINT-3822 FIXED Show busy mode message only once for each im session.maxim@mnikolenko
2014-03-12merge with releaseRichard Linden
2014-02-26fixed mispelling of generateOutgoingAdHocHashRichard Linden
2013-11-06merge with releaseRichard Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-08-29MAINT-3048 FIXED Don't block IMs from Lindens even when "Only friends and ↵Mnikolenko ProductEngine
groups can call or IM me" is set
2013-08-28merging viewer releaseGilbert Gonzales
2013-09-26MAINT-3163 FIXED Since CHUI, floaters can be moved totally underneath bottom ↵maksymsproductengine
toolbar buttons and "lost".
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-23CHUI-986 FIXED Don't open Conversation floater for offline IMs if it's not ↵Mnikolenko ProductEngine
from group or friend.
2013-06-20merge with releaseRichard Linden
2013-06-19Pull merge from lindenlab/viewer-releaseMerov Linden
2013-06-19Merge conflict mixup, use noaction instead of none for user preferenceMerov Linden
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-06-18CHUI-979 FIXED Clear highlight after clicking in chat input. Do not flash ↵Mnikolenko ProductEngine
chat button if current conversation is focused and torned off.
2013-06-12CHUI-896 ADD FIX Line flashing and FUI button flashing not working correctly ↵PavelK ProductEngine
for CHUI notifications 1) Fixed line flashing upon conversation floater opening (previously was highlight only) 2) Fixed line highlight (and flashing) clearing when clicking Chat input field
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-06CHUI-896 ADD FIX Line flashing and FUI button flashing not working correctly ↵PavelK ProductEngine
for CHUI notifications Fixed line flashing when conversations floater is open but does not have focus
2013-06-05merge with viewer-releaseRichard Linden
2013-06-04CHUI-972 FIXED Don't show voice request in DND mode, even if session with ↵Mnikolenko ProductEngine
participant exists.
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-15CHUI-945 FIXED Add Object IMs to Chat Notification PreferencesPavelK ProductEngine
2013-05-16CHUI-913 Additional fixMnikolenko ProductEngine
2013-05-15CHUI-913 FIXED Show toasts for torn-off windows that aren't collapsed.Mnikolenko ProductEngine
2013-05-05Spring cleaning: removed unused .cpp and.h files, and cleaned up header ↵Richard Linden
dependencies
2013-05-02Pull from viewer-releaseMerov 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-17CHUI-933 FIXED No notification of IMs when coming out of Do Not Disturb mode ↵PavelK ProductEngine
with Flash Toolbar button preference
2013-04-09CHUI-923 FIXED Show toasts if Conversation floater is focussed and current ↵Mnikolenko ProductEngine
conversation is not selected.
2013-04-02Merged in chui beta code.prep@lindenlab.com
2013-04-01CHUI-896 : ADD FIX : Line flashing and FUI button flashing not working ↵AlexanderP ProductEngine
correctly for CHUI notifications backed out 902caf2 and (partly) d498514; case "NOT_ON_TOP" was fixed
2013-03-29CHUI-807 : Trace add and remove sessionsMerov Linden
2013-03-29CHUI-807 : Add more defensive coding. Also trace in log the sessions created ↵Merov Linden
so we'll have a better idea of what people do with conversations if we see that crash again.
2013-03-29Another Chui beta6+ merge to deal with build issuesprep@lindenlab.com
2013-03-29Additional fix for CHUI-903Mnikolenko ProductEngine
2013-03-29Merged in Chui beta6+ fixesprep@lindenlab.com
2013-03-29CHUI-903 FIXED Don't show toasts if Session floater is torn-off and in focus.Mnikolenko ProductEngine
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28CHUI-896 FIXED Line flashing and FUI button flashing not working correctly ↵AlexanderP ProductEngine
for CHUI notifications: added flashing of the line item after conv. floater opens
2013-03-27CHUI-486 ADD FIX Update Preferences -> Chat XUIAlexanderP ProductEngine
1) when preference is "Pop up" - added toast according to Kurt's comment from 22/Dec/12; 2) fixed line item flashing and "Chat" button flashing in other cases according to original matrix.
2013-03-27CHUI-895 FIXED Show toasts for messages if conversation is collapsed to ↵Mnikolenko ProductEngine
Input bar(regardless of other prefs).
2013-03-22CHUI-486 FIXED Update Preferences -> Chat XUI: implemented new bthavior; ↵AlexanderP ProductEngine
deleted spaghetti code
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 08:41:10 +0000