summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-02-07Pull merge from lindenlab/viewer-chuiMerov Linden
2013-02-07CHUI-735 : Fixed! Handle the backspace case, suppress the search string ↵Merov Linden
handling from LLFolderView (it's in the search edit field now).
2013-02-07CHUI-722 Fixed! Add ? button to titlebar on floaters: Conversation Log, ↵AlexanderP ProductEngine
Nearby Chat History, and IM History
2013-02-06Pull merge from lindenlab/viewer-chuiMerov Linden
2013-02-06CHUI-735 : Fixed! Move the delete key handling from the llfolderview to the ↵Merov Linden
llinventorypanel level.
2013-02-06CHUI-712 FIXED IM log files renamed with ll.txt will create double files for ↵maksymsproductengine
users
2013-02-06CHUI-744 FIXED KeepConversationLogTranscripts setting is moved to ↵Mnikolenko ProductEngine
settings_per_account.xml
2013-02-06mergemberezhnoy
2013-02-06CHUI-716 FIXED Call onClickCloseBtn() to avoid complete disappearing of torn ↵Mnikolenko ProductEngine
off Nearby chat.
2013-02-06CHUI-597 (Messages shown in Conversation Log are inaccurate)mberezhnoy
Added messages, for now they're displayed in two cases: 1) no log entries, logging disabled 2) no log entries, logging enabled Case when there are existing log entries and logging is disabled is still under discussion
2013-02-05CHUI-677 : Fixed! Use the selected session for doToSelectedGroup(), not the ↵Merov Linden
selected item.
2013-02-05Pull merge from lindenlab/viewer-chuiMerov Linden
2013-02-05CHUI-730 : Fixed! Only clear out More sub menus in inventoryMerov Linden
2013-02-04mergeGilbert Gonzales
2013-02-04Pull merge from lindenlab/viewer-chuiMerov Linden
2013-02-04CHUI-677 : Added a warning printout in the log to capture context of this bug.Merov Linden
2013-02-04mergeGilbert Gonzales
2013-02-04CHUI-695 FIXED Viewer crashes after attempt to accept a friendship in IMmaksymsproductengine
2013-02-04CHUI-721 FIXED Delete transcripts when performing Clear log action.Mnikolenko ProductEngine
2013-02-01mergeGilbert Gonzales
2013-02-01CHUI-691: Now when an estate message is received while in DND mode, a toast ↵Gilbert Gonzales
notification will appear.
2013-02-02mergingCho
2013-02-01mergeGilbert Gonzales
2013-02-01CHUI-689: When DND mode is enabled, making a direct delivery purchase ↵Gilbert Gonzales
results in an IM message from '(Nobody)'. Solution: Fixed a problem in process_improved_im that would falsy use system messages while in DND mode as an IM from a user. Also made it so that while in DND mode, SystemMessages and message with a high or greater priority are shown to the user as toasts (before a notification chiclet would just appear without the toast).
2013-02-01CHUI-675 FIX You can select multiple users in people floater but can only ↵Cho
drag and drop one name to conversation Moved drag and drop start in LLAvatarListItem instead of LLAvatarList, and made LLFloaterIMSession handle multiple dropped participants correctly
2013-02-01CHUI-715 FIXED Disable Gear button if no conversation is selectedMnikolenko ProductEngine
2013-02-01mergingmberezhnoy
2013-01-31Mergemaxim@mnikolenko
2013-01-31CHUI-719 FIXED Font color was changed.maxim@mnikolenko
2013-01-31Pull merge with lindenlab/viewer-chuiMerov Linden
2013-01-31CHUI-711 FIXED Load logs from file only once to avoid duplicating. This will ↵maxim@mnikolenko
also solve problem with chui-710.
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-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-31CHUI-612 FIXED Blank conversation names showing in conversation listmaksymsproductengine
2013-01-30mergingmberezhnoy
2013-01-30merging latest changesCho
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 back more 3.4.5 beta fixesOz Linden
2013-01-30merging latest changesCho
2013-01-30CHUI-647 FIX "Conversations" floater is not opened when user wants to share ↵Cho
something via "Conversation log" floater Added call to show conversations floater in LLAvatarActions::share
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-29merge changes for MAINT-2276Oz Linden
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-29mergeGilbert Gonzales
2013-01-29CHUI-667: Attempting to correct Mac/Linux build issue.Gilbert Gonzales
2013-01-28CHUI-667: Post code review changesGilbert Gonzales
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 ↵Cho
Console Immediately. Removed new code from on_new_message in LLIMView and instead, changed condition in LLFloaterIMSession::newIMCallback to update messages whenever the floater is visible