summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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-07SH-3852 WIP - small tweaksBrad Payne (Vir Linden)
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-06mergeNyx Linden
2013-02-06SH-3651 FIX Beard edits not applying on server bakesNyx Linden
Despite incrementing the COF version, beard edits were not updating the head hash. We were not applying layers/parameters to the baked texture hashes for layers that did not contain a user-defined image. However, many layers have standard morph masks, etc that are affected by wearable parameters. Edited the LLTexLayerInterface::getWearable() method to return the proper wearable type if there is no associated local texture index, and all parameters in the wearable refer to a particular wearable type. Should be safe even if some (but not all) params have no wearable type defined.
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
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-05merge changes for 3.4.5-beta5Oz Linden
2013-02-05Added tag 3.4.5-beta5 for changeset 852b69ef0b5fOz Linden
2013-02-05merge changes for DRTVWR-297Oz Linden
2013-02-05tag merge of DRTVWR-297Oz Linden
2013-02-05merge changes for DRTVWR-296Oz Linden
2013-02-05tag merge of DRTVWR-296Oz Linden
2013-02-04Pull merge from lindenlab/viewer-chuiMerov Linden
2013-02-04CHUI-732 : Fixed! Do not iterate through selection while modufying it at the ↵Merov Linden
same time, use a temp set.
2013-02-04mergeGilbert Gonzales