d4e4a618fb
merging
2013-02-13 00:13:34 +00:00
649a191c4f
CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle mute this participant"
...
Made mute and unmute invisible instead of disabled when not available
2013-02-13 00:12:04 +00:00
c508dac8ed
Pull merge from lindenlab/viewer-development
2013-02-12 12:26:07 -08:00
f3ef72bffa
merging
2013-02-12 17:48:53 +00:00
8d4b0b9246
pull back 3.4.5-release tag
2013-02-12 10:43:46 -05:00
8aaedd0a5f
CHUI-742 FIXED Update log location when closing Preference floater.
2013-02-12 14:27:52 +02:00
e87000ba07
Added tag 3.4.5-release for changeset a49c715243a3
2013-02-12 07:06:24 -05:00
a591314459
merging
2013-02-12 01:36:35 +00:00
5a92a77006
CHUI-740 FIX Incorrect option shown in group Moderator tools "Toggle mute this participant"
...
Reverted changes in menu_conversation.xml, llconversationmodel.cpp, and llfloaterimcontainer.cpp
2013-02-12 01:12:47 +00:00
2317591c93
Pull merge from lindenlab/viewer-chui
2013-02-11 16:10:34 -08:00
279d4a95ea
CHUI-690 : Fixed! Prevent xml parsing error when building Places panel providing an option menu to the LLFolderView constructor
2013-02-11 16:08:45 -08:00
c4bcd4f2c2
merging
2013-02-11 22:43:15 +00:00
f6b9d2bce4
CHUI-760 FIX Conversation.log file not saved in user specified location
...
Changed LLConversationLog::getFileName() to use LL_PATH_PER_ACCOUNT_CHAT_LOGS instead of LL_PATH_PER_SL_ACCOUNT
2013-02-11 20:39:03 +00:00
33d49d1569
CHUI-755 FIX Conversation log changes in a session are lost if viewer crashes
...
Added call to LLConversationLog::instance().cache() after LLLogChat::SaveHistory() in LLIMView::logToFile()
2013-02-11 20:02:19 +00:00
a8776acbb3
merge
2013-02-11 09:32:47 -08:00
5066e850df
CHUI-728 FIXED Don't display Nearby chat participants if Conversation pane is collapsed.
2013-02-11 15:26:17 +02:00
4b43672690
CHUI-751 FIXED Triple click is now handled.
2013-02-11 15:22:24 +02:00
9a75eeb67e
Fix for build issue under windows
2013-02-11 14:39:05 +02:00
5ecac2e900
CHUI-735 : Fixed! Refactor the code to move isSelectionRemovable() to the LLInventoryPanel level. Use it when using the delete key.
2013-02-08 22:38:54 -08:00
22bc40ad60
Pull merge from lindenlab/viewer-chui
2013-02-08 20:52:32 -08:00
2e2026a4f8
CHUI-746 : Fixed! Undid the MAINT-2276 hack now that submenus do work thanks to CHUI-682
2013-02-08 20:51:02 -08:00
2ce1707642
merge
2013-02-08 18:13:20 -08:00
a034c272c3
CHUI-747: Script buttons in a toast overlap message text. Problem was due to 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-08 18:12:26 -08:00
ec6c132e14
merging
2013-02-08 19:18:06 +00:00
4a0dd9ec76
CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated after relogin while group invitation
...
Renamed LLDockControl::mDockWidget to mDockWidgetHandle for clarity
2013-02-08 19:16:38 +00:00
46294bdcac
CHUI-731 FIXED Viewer crashed while deleting text from IM message
2013-02-08 19:54:34 +02:00
fd9d1f985e
merging
2013-02-09 10:47:47 +02:00
64fe330620
CHUI-713 "Conversations" floater size doesn't persist between sessions
...
additional fix
2013-02-09 00:10:09 +02:00
c55e4a6124
CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated 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-08 02:03:28 +00:00
29a57c16c9
CHUI-736: When auto-exit DND mode upon startup, stored conversations are not highlighted. When the dnd im is processed, now flash the conversation line item.
2013-02-07 14:41:38 -08:00
3016afcd06
Pull merge from lindenlab/viewer-chui
2013-02-07 13:39:50 -08:00
dac026a7d6
CHUI-735 : Fixed! Handle the backspace case, suppress the search string handling from LLFolderView (it's in the search edit field now).
2013-02-07 13:27:32 -08:00
68a4a8402c
CHUI-722 Fixed! Add ? button to titlebar on floaters: Conversation Log, Nearby Chat History, and IM History
2013-02-07 19:39:46 +02:00
b356bbb6a5
CHUI-713 "Conversations" floater size doesn't persist between sessions
2013-02-07 10:48:49 +02:00
560aba3aa4
Pull merge from lindenlab/viewer-chui
2013-02-06 18:18:44 -08:00
7ed270ff9d
CHUI-735 : Fixed! Move the delete key handling from the llfolderview to the llinventorypanel level.
2013-02-06 18:11:52 -08:00
ec0ac12eba
CHUI-712 FIXED IM log files renamed with ll.txt will create double files for users
2013-02-06 20:51:14 +02:00
f944608ab9
CHUI-707: "Chat" toolbar button stop flashing after setting toolbar buttons view to "Icons only": save/restore flashing states
2013-02-06 20:00:43 +02:00
302f57e47f
CHUI-744 FIXED KeepConversationLogTranscripts setting is moved to settings_per_account.xml
2013-02-06 20:17:35 +02:00
9b0404c4b5
merge
2013-02-06 19:59:57 +02:00
418b0334f2
CHUI-716 FIXED Call onClickCloseBtn() to avoid complete disappearing of torn off Nearby chat.
2013-02-06 15:06:27 +02:00
3781615afa
CHUI-597 (Messages shown in Conversation Log are inaccurate)
...
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-06 10:03:42 +02:00
5b143ee2c7
CHUI-677 : Fixed! Use the selected session for doToSelectedGroup(), not the selected item.
2013-02-05 22:26:58 -08:00
dadc5e84e1
Pull merge from lindenlab/viewer-chui
2013-02-05 21:13:06 -08:00
2aee8f6fbe
CHUI-730 : Fixed! Only clear out More sub menus in inventory
2013-02-05 21:11:33 -08:00
8b8142c04e
merge changes for 3.4.5-beta5
2013-02-05 14:11:04 -05:00
79eeae502c
Added tag 3.4.5-beta5 for changeset 852b69ef0b5f
2013-02-05 13:25:24 -05:00
34c0ed7e99
merge changes for DRTVWR-297
2013-02-05 12:32:52 -05:00
d96c3220f8
tag merge of DRTVWR-297
2013-02-05 12:32:14 -05:00
3279201c1b
merge changes for DRTVWR-296
2013-02-05 12:30:34 -05:00
Cho