Commit Graph

400 Commits (e775e95416234f9a6abdb00a792b8ba392eeb607)

Author SHA1 Message Date
Gilbert Gonzales e775e95416 merging in latest changes 2012-11-15 15:45:02 -08:00
Gilbert Gonzales d3474c6eaf CHUI-489: Now sounds exist for teleport and inventory offers. The sound is specified in notifications.xml. Also changes for CHUI 486, which allow the user to set preferences for hearing sounds for a New Conversation, Incoming Voice Call, Teleport Offer and Inventory Offer. 2012-11-15 15:42:22 -08:00
maxim_productengine 4094972434 CHUI-389 FIXED Added parameter for sessionAdded to get access to has_offline_msg value.
Set UnreadIMs icon to visible if messages were sent while offline.
2012-11-14 15:28:05 +02:00
Gilbert Gonzales d75824d520 CHUI-486: Post code review changes for last submit, just added in some parenthesis for conditional statements, thus making them more clear. 2012-11-13 16:45:56 -08:00
Gilbert Gonzales 39d46d2178 merging in latest changes 2012-11-13 11:20:33 -08:00
Gilbert Gonzales 5a31b5dcea CHUI-486: Code cleanup, instead of using values such as 0, 1, 2 now using strings 'toast', 'flash', 'none'. These values are used whether to show a notification or not. 2012-11-13 11:19:45 -08:00
maxim_productengine aa2640f13a CHUI-447 FIXED Set session name as avatar's display name, if session is created by getting new message. 2012-11-13 14:04:14 +02:00
Gilbert Gonzales 91781df370 CHUI-486: Now toasts only appear when proper 'Chat Preference' setting is set to 'Pop Up Message'. 2012-11-12 18:18:34 -08:00
AlexanderP ProductEngine 486bdf3284 CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00
William Todd Stinson a312498260 Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-11-08 12:38:09 -08:00
William Todd Stinson c4eaaa3d6a CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now refers to it as Do Not Disturb mode. 2012-11-08 12:35:15 -08:00
AlexanderP ProductEngine 93f9c69918 CHUI-387 FIXED (Conversation toasts not shown for open conversations when conversation floater is in a minimized state or undocked conversation is minimized): added checking of the minimized state 2012-11-08 17:00:42 +02:00
Gilbert Gonzales b77e2f17aa CHUI-449: Problem: When a toast was clicked, the conversation floater was displayed without selecting the conversation line item. Resolution: Added a function that will show the conversation floater container and then trigger selecting the conversation line item. When the conversation line item is selecting this implicitly will cause the correct conversation floater to be displayed. 2012-10-24 16:02:58 -07:00
Gilbert Gonzales 23d58c0c09 CHUI-433: Implemented an alternate solution to the problem. The original solution was ambiguous and incomplete and also preserved an existing hack. The new solution removes a hack/deprecated code (setActiveSession/getActiveSession functions). Basically, a toast message is not displayed if the user already has the conversation in focus. When the conversation floater loses focus toasts message will be displayed for that conversation. 2012-10-22 17:31:51 -07:00
Gilbert Gonzales b0c54dfd3e CHUI-433: Problem: Toasts were not being displayed due to incorrect tracking of the current conversation with focus. Resolution: Now when a conversation gains focus it will set a flag to ignore toasts. And when a conversation loses focus it will set a flag to re-enable toasts. 2012-10-19 17:47:28 -07:00
Gilbert Gonzales 7b5006a211 merging in latest changes 2012-10-15 13:59:05 -07:00
Gilbert Gonzales 5a5df259ff CHUI-380: Final commit for this issue. After code review changed some method names to be more accurate. Also using dynamic_cast instead of static_cast for safety. 2012-10-15 13:58:21 -07:00
Gilbert Gonzales d7d0416547 CHUI-380: (In progress) Refactoring needed to fix focusing issues when selecting an existing conversation item. This commit resolves re-introducing bug CHUI-289. Will code review and cleanup code in next commit. 2012-10-12 20:15:57 -07:00
maksymsproductengine 19c5b35a86 CHUI-385 FIXED All user's do not receive ad hoc messages after adding a user to a conversation 2012-10-12 20:10:13 +03:00
maxim_productengine 0ff5a0c8ce CHUI-356 FIXED Call notifyObserverSessionIDUpdated() only after initing IM floater with new session id 2012-10-11 19:58:26 +03:00
Paul ProductEngine a3607a8d8c CHUI-339 FIXED (2 entries shown in conversation log for ad hoc conference for user that starts the conference) 2012-09-18 16:41:37 +03:00
AlexanderP ProductEngine ae2e611dfb CHUI-315 (Nearby chat messages do not appear in conversation floater): cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it. 2012-08-31 16:52:50 +03:00
Paul ProductEngine d4ee17e533 CHUI-275 FIXED (Chat history viewer does not show entire user.txt IM log file)
- Renamed LLLogChat::loadAllHistory to LLLogChat::loadChatHistory because it doesn't actually loads all history. Also added parameter to the function which is a flag whether to load all file's content or not.
- Implemented displaying history by pages (as was decided on meeting page): Added showHistory() method to the LLFloaterConversationPreview which shows the chat history page by page starting from the last conversation (or may say starting from the last page). One page contains 100 entries. Added "More history..." button to display next page of history.
2012-08-28 14:48:32 +03:00
AlexanderP ProductEngine 14708a3ace CHUI_310 make NearbyChat a singletone 2012-08-22 18:27:29 +03:00
Todd Stinson c1aa0cc4fc Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-07-27 15:38:03 -07:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Paul ProductEngine 0ee0a5eff4 CHUI-151 FIXED (Implement conversation log)
A brief explanation of what have been implemented. More information can be found in comments.

1. Created conversation history viewer (llfloaterconversationpreview)
2. Created LLConversation and LLConversationLog classes which represent and hold data of conversations (llconversationlog)
3. Created LLConversationLogList and LLConversationLogListItem which are the visual representation of LLConversationLog and LLConversation respectively
4. Created LLFloaterConversationLog - which holds and displays LLConversationLogList
2012-07-27 22:25:17 +03:00
AlexanderP ProductEngine c76c73770b CHUI-195 FIXED Starting ad-hoc conference call does not open Conversations floater 2012-07-04 17:57:46 +03:00
AlexanderP ProductEngine d866328f6a CHUI-100 Fix floater's key 2012-06-22 16:11:25 +03:00
AlexanderP ProductEngine fd247320ce CHUI-125 FIXED if a call is accept then open im-session's floater 2012-06-20 17:51:56 +03:00
Seth ProductEngine d11f542ffe CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P chat, after adding more participants.
- Added a parameter to LLAvatarActions::startConference() and LLIMMgr::addSession() to pass the uuid of a P2P IM floater which should be used to start a new conference in it.
- In LLChicletBar::sessionRemoved() we don't close the IM floater if it is going to be re-used for a new conference.
2012-06-07 00:59:05 +03:00
Seth ProductEngine bba0f4f74e CHUI-119 WIP 2012-05-31 16:37:22 +03:00
AlexanderP ProductEngine 47ec4faeb4 CHUI-119 WIP Prepare the nearby chat for hosting it by the IM-container 2012-05-30 19:58:20 +03:00
AlexanderP ProductEngine 4fc8000d66 CHUI-105 ADD. FIX Implement changes to all open conversations and nearby chat 2012-05-17 19:35:05 +03:00
Nat Goodspeed 78f2663c4a Automated merge with http://hg.secondlife.com/viewer-release 2012-04-26 14:04:55 -04:00
Seth ProductEngine c104c887c5 Mac build fix. 2012-04-17 17:36:22 +03:00
Vadim ProductEngine cbbbbcb6c3 MAINT-180 FIXED Reject group and ad-hoc chat messages from lindens when we are busy. 2012-04-02 20:36:52 +03:00
Oz Linden 633bd44b4a merge changes for vmrg-225 2012-03-09 12:58:50 -05:00
Jonathan Yap 9003c4c54b STORM-1795 Small logic/formatting change 2012-01-23 17:43:05 -05:00
Jonathan Yap 44436d0240 STORM-1795 Fixed misspelled variable 2012-01-20 14:26:45 -05:00
Jonathan Yap d70d57c938 STORM-1795 Fix logic error 2012-01-20 14:15:31 -05:00
Paul ProductEngine 82e90a6af5 EXP-901 FIXED (Can see "typing" messages from users who are not allowed to IM you)
- If "Only friends and groups can IM me" option is ON but the user got message from non-friend, show notification one time per session.
2012-01-20 08:59:37 +02:00
Jonathan Yap da40427a0b STORM-1795 Ad-hoc messages are received even when "Only friends and groups can call or IM me" 2012-01-16 14:27:35 -05:00
Jonathan Yap 2c9db624fb STORM-1731 Adjusted if muted logic slightly 2011-12-12 14:48:36 -05:00
Jonathan Yap f2d2e7e489 STORM-1731 Changes per RB comments: changed llwarns to llinfos, added check so you cannot mute a Linden 2011-12-12 11:32:34 -05:00
Jonathan Yap a03b3aaa60 STORM-1731 Ad-hoc confererence block failing. Residents using it to start massive multi-sim conferences, used as a griefing tool. 2011-12-12 08:51:16 -05:00
Leslie Linden 8448e3b86e EXP-1398 FIX -- Viewer Crash when moving Speak button from bottom toolbar to side toolbar with call request dialog active on Mac
* Added "on button removed" callback for toolbars.
* Changed docking on incoming and outgoing call floaters to be undocked when "speak" button removed.

Reviewed by Leyla.
2011-10-25 14:14:46 -07:00
Paul ProductEngine 338914bd7d EXP-1400 FIXED (Call request docking icon overlays other toolbar buttons when speak button in side toolbar)
- LLDockableFloater::getDockTongue to init dock tongue with proper image depending on floater dock side, also added images for left and right tongues.

- Added proper call floater positioning relatively to the speak button
2011-10-24 14:17:15 +02:00
Paul ProductEngine 2456573925 EXP-1404 FIXED (Dock icon shown in lower left corner of call dialog when user has speak icon hidden)
- Don't draw tongue of dockable call dialog floater in case speak button is not present in any tool bar.
2011-10-21 19:14:10 +02:00
Richard Nelson c05d86039c EXP-1384 FIX Voice requests not received in FUI viewer
fixed case where toolbar button was not in use
2011-10-17 15:08:44 -07:00