summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-02-13mergeGilbert Gonzales
2013-02-13CHUI-695: When the 'Accept' button is pressed the toast panel will be ↵Gilbert Gonzales
resized to the conversation floater dimensions after all buttons and text has been added to the toast panel
2013-02-13Pull merge from lindenlab/viewer-chuiMerov Linden
2013-02-13CHUI-770 : Fixed! Need to use the User Name and not the Account Name to save ↵Merov Linden
the favorites.
2013-02-13mergingCho
2013-02-13CHUI-769 FIXED The text of the dialog is changed.Mnikolenko ProductEngine
2013-02-13CHUI-761 FIXED Clear log button will not clear transcripts.Mnikolenko ProductEngine
2013-02-13CHUI-737 FIXED Reselect current conversation when floater is opened.Mnikolenko ProductEngine
2013-02-13CHUI-765 FIXED User's name is added to the list in Nearby tab.Mnikolenko ProductEngine
2013-02-13CHUI-743 FIXED CHUI viewer ignores pre chui users Privacy settings to not ↵maksymsproductengine
keep IM logs and nearby chat logs
2013-02-12mergeGilbert Gonzales
2013-02-12CHUI-695: Viewer crash when accepting friend offer in conversations window. ↵Gilbert Gonzales
Problem was that LLIMToastNotifyPanel::snapToMessageHeight was calling LLToastPanel::reshape, which would then call LLIMToastNotifyPanel::reshape again. Resolution: Modified LLIMToastNotifyPanel::snapToMessageHeight to cleanly replicate what LLToastPanel::reshape was doing.
2013-02-13CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle mute ↵Cho
this participant" Added new LLFloaterIMContainer::visibleContextMenuItem() connected to "Avatar.VisibleItem"
2013-02-13mergingCho
2013-02-13CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle mute ↵Cho
this participant" Made mute and unmute invisible instead of disabled when not available
2013-02-12CHUI-758: Group notice received in DND mode causes crash on startup when ↵Gilbert Gonzales
auto-exiting DND mode. Crash occurred because two instances of the Group Notice notification were trying to be added from the persistent storage and then the DND storage.
2013-02-12Pull merge from lindenlab/viewer-developmentMerov Linden
2013-02-12mergingCho
2013-02-12CHUI-742 FIXED Update log location when closing Preference floater.Mnikolenko ProductEngine
2013-02-12mergingCho
2013-02-12CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle mute ↵Cho
this participant" Reverted changes in menu_conversation.xml, llconversationmodel.cpp, and llfloaterimcontainer.cpp
2013-02-11Pull merge from lindenlab/viewer-chuiMerov Linden
2013-02-11CHUI-690 : Fixed! Prevent xml parsing error when building Places panel ↵Merov Linden
providing an option menu to the LLFolderView constructor
2013-02-11mergingCho
2013-02-11CHUI-760 FIX Conversation.log file not saved in user specified locationCho
Changed LLConversationLog::getFileName() to use LL_PATH_PER_ACCOUNT_CHAT_LOGS instead of LL_PATH_PER_SL_ACCOUNT
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-11mergeGilbert Gonzales
2013-02-11CHUI-728 FIXED Don't display Nearby chat participants if Conversation pane ↵Mnikolenko ProductEngine
is collapsed.
2013-02-11CHUI-751 FIXED Triple click is now handled.Mnikolenko ProductEngine
2013-02-11Fix for build issue under windowsmaksymsproductengine
2013-02-08CHUI-735 : Fixed! Refactor the code to move isSelectionRemovable() to the ↵Merov Linden
LLInventoryPanel level. Use it when using the delete key.
2013-02-08Pull merge from lindenlab/viewer-chuiMerov Linden
2013-02-08CHUI-746 : Fixed! Undid the MAINT-2276 hack now that submenus do work thanks ↵Merov Linden
to CHUI-682
2013-02-08mergeGilbert Gonzales
2013-02-08CHUI-747: Script buttons in a toast overlap message text. Problem was due to ↵Gilbert Gonzales
the message container not being shifted upward when buttons were added to the control buttons container (which is beneath the message container). A small change in CHUI-695 caused this.
2013-02-08mergingCho
2013-02-08CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated ↵Cho
after relogin while group invitation Renamed LLDockControl::mDockWidget to mDockWidgetHandle for clarity
2013-02-08CHUI-731 FIXED Viewer crashed while deleting text from IM messagemaksymsproductengine
2013-02-09mergingmberezhnoy
2013-02-09CHUI-713 "Conversations" floater size doesn't persist between sessionsmberezhnoy
additional fix
2013-02-08CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated ↵Cho
after relogin while group invitation Changed LLPersistentNotificationStorage::saveNotification() to use notification->asLLSD(true) to skip duplicates Changed LLDockControl::mDockWidget to be a LLHandle<LLView> instead of a LLView* to fix crash (from accessing deleted LLView)
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-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-07CHUI-713 "Conversations" floater size doesn't persist between sessionsmberezhnoy
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-707: "Chat" toolbar button stop flashing after setting toolbar buttons ↵AlexanderP ProductEngine
view to "Icons only": save/restore flashing states