summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-12mergeNyx Linden
2013-02-12SH-3859 FIX adding or removing clothing in appearance edit mode are visibleNyx Linden
Added check to cancel any appearance update requests that occur while in appearance edit mode. Closing appearance edit mode does trigger an update, so should be safe to cancel intermediate requests without further changes.
2013-02-12SH-3852 WIP - removed agent_id from summary packetsBrad Payne (Vir Linden)
2013-02-12removed some redundant or deprecated timersBrad Payne (Vir Linden)
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-12For MAINT-576 fix water shader visual issues in non-deferred Review: DavePGraham Madarasz (Graham)
2013-02-12SH-2852 WIP - track avatar loading via load_<foo> timers, added distinction ↵Brad Payne (Vir Linden)
between partially and fully loaded textures
2013-02-12mergingCho
2013-02-12SH-3852 WIP - added more specific logging of completenesss of texture loadingBrad Payne (Vir Linden)
2013-02-12pull back 3.4.5-release tagOz Linden
2013-02-12CHUI-742 FIXED Update log location when closing Preference floater.Mnikolenko ProductEngine
2013-02-12Added tag 3.4.5-release for changeset a49c715243a3Oz Linden
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-11fix for build failure on test w/linuxBrad Payne (Vir Linden)
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-11mergeBrad Payne (Vir Linden)
2013-02-11fix for mac build failureBrad Payne (Vir Linden)
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-11Updating appearance utilDon Kjer
2013-02-11mergeBrad Payne (Vir Linden)
2013-02-11SH-3852 WIP - removed avatar metrics from ViewerAssetMetricsBrad Payne (Vir Linden)
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-09Updating appearance utilityDon Kjer
2013-02-09Automated mergeDon Kjer
2013-02-09Updating appearance utilityDon Kjer
2013-02-08SH-3852 WIP - bucketize stats by agent_id, grid coordinates and various ↵Brad Payne (Vir Linden)
other criteria
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-07SH-3852 WIP - track per-timer statsBrad Payne (Vir Linden)
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