summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
AgeCommit message (Collapse)Author
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-06-20merge with releaseRichard Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-05-05Spring cleaning: removed unused .cpp and.h files, and cleaned up header ↵Richard Linden
dependencies
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-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
2013-03-20Merge with viewer-chuiprep@lindenlab.com
2013-03-19CHUI 796 (User doesn't get all messages in 'do not disturb' mode): Now IM ↵Gilbert Gonzales
DND notifications will be stored as p2p, ad-hoc or group. When loading these notifications upon app start ad-hoc/group notifications will launch the conversation log and play a sound.
2013-03-15Pull merge from lindenlab/viewer-chuiMerov Linden
2013-03-15CHUI-807 : More defensive code. Don't assume anything while iterating ↵Merov Linden
through panels.
2013-03-15CHUI-831 ADD FIX Minimized conversation floater is not opened with Open ↵AlexanderP ProductEngine
Conversation Window preference if conversation receiving message is selected
2013-03-14mergingmberezhnoy
2013-03-14CHUI-844 (Collapsed conversation panel auto expands when a new IM ↵mberezhnoy
conversation starts) CHUI-713 ("Conversations" floater size doesn't persist between sessions)
2013-03-13CHUI-831 ADD FIX Minimized conversation floater is not opened with Open ↵alexanderpproductengine
Conversation Window preference if conversation receiving message is selected
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-14CHUI-853 (Crashing on ejecting member in group): Upon receiving the ↵Gilbert Gonzales
rejection response message, the incorrect session id was being used to display the message. session_id was being used instead of new_session_id.
2013-03-12CHUI-831 Minimized conversation floater is not opened with Open Conversation ↵AlexanderP ProductEngine
Window preference if conversation receiving message is selected : force unminimized of the session's floater
2013-03-11Viewer-chui mergeprep
2013-03-05Fixing issues with not detecting when LLSD XML parsing fails. Changing most ↵Don Kjer
http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-03-04CHUI-806 (IM floater is not become as a top while geting message with ↵mberezhnoy
enabled 'Open conversation window' option)
2013-02-20CHUI-773 ADD FIX Conversation line item does not flash for unselected ↵AlexanderP ProductEngine
conversation when Flash Toolbar Button preference is selected : repair case "open and not on top"
2013-02-14CHUI-773 Conversation line item does not flash for unselected conversation ↵AlexanderP ProductEngine
when Flash Toolbar Button preference is selected: add flashing in "toast" case when session floater is open but not selected
2013-02-11CHUI-755 FIX Conversation log changes in a session are lost if viewer crashesCho
Added call to LLConversationLog::instance().cache() after LLLogChat::SaveHistory() in LLIMView::logToFile()
2013-02-07CHUI-736: When auto-exit DND mode upon startup, stored conversations are not ↵Gilbert Gonzales
highlighted. When the dnd im is processed, now flash the conversation line item.
2013-02-06CHUI-744 FIXED KeepConversationLogTranscripts setting is moved to ↵Mnikolenko ProductEngine
settings_per_account.xml
2013-02-04CHUI-677 : Added a warning printout in the log to capture context of this bug.Merov Linden
2013-02-01mergingmberezhnoy
2013-01-31CHUI-718 (User does not see own chat in conference IM)mberezhnoy
CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears, after ejecting any member from group)
2013-01-31CHUI-612 FIXED Blank conversation names showing in conversation listmaksymsproductengine
2013-01-30mergingmberezhnoy
2013-01-30CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name ↵mberezhnoy
appears, after ejecting any member from group)
2013-01-29Pull merge from lindenlab/viewer-chuiMerov Linden
2013-01-29CHUI-436 : Fixed : Do not skip yourself or group chat when checked Only ↵Merov Linden
friends and groups can call or IM me pref.
2013-01-29CHUI-88 I shouldn't see Conference IMs from people I muted. Fix: In order to ↵Gilbert Gonzales
mute a user who initiated a conference/group chat, the session must be created on the server side and then left.
2013-01-29merging latest changesCho