summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.h
AgeCommit message (Collapse)Author
2012-11-09CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and ↵AlexanderP ProductEngine
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-08Pull merge from viewer-chuiMerov Linden
2012-11-07CHUI-473, CHUI-482 FIXED (Clicking on nearby chat toast to open Conversation ↵AlexanderP ProductEngine
floater does not show Nearby Chat conversation selected in list; Nearby chat conversation is not selected in list by default when it is the only conversation ): implement. new logic in LLIMFloaterContainer for the syncronous select the conv. list's item and corresponding convers. floater; removed floater selecting from conv. items; fixed bug with item select
2012-11-05CHUI-468 : Suppress LLIMFloater::onParticipantsListChanged(). Not useful ↵Merov Linden
anymore.
2012-11-04Merge viewer-hui-441Merov Linden
2012-11-03Pull merge from richard/viewer-chuiMerov Linden
2012-11-02CHUI-481, CHUI-404, CHUI-405, CHUI-406, CHUI-407, CHUI-408 : Fixed! Change ↵Merov Linden
the way Ad-hoc and P2P chats update their session name in a way which is consistent and honor display name.
2012-11-02CHUI-481 : WIP : Make updateSessionName() a virtual method of ↵Merov Linden
LLIMConversation so we can eventually call it on events
2012-10-31CHUI-374 ADD. FIX, CHUI-442 FIXED (Nearby chat is torn off and cannot be ↵AlexanderP ProductEngine
docked if nearby chat is received while conversation floater is closed) - implement. lazy creating of container
2012-10-26CHUI-383: Now a new conversation will not take focus. Instead a toast will ↵Gilbert Gonzales
appear. Problem: Each time a conversation was added, code would execute to add the conversation floater AND select the conversation. Resolution: This is no longer the expected behavior so adjusted LLIMFloater::addToHost() to only add a floater and not select/show the floater. If selection and/or showing is needed it seems to make sense that this is done outside LLIMFloater:addToHost().
2012-10-11CHUI-380: Before code review changes. Now the user selects a conversation or ↵Gilbert Gonzales
participant of a conversation the correct chat floater will appear. Focus will be redirected to the chat input text box automatically allowing the user to type into the input text box.
2012-10-01merging in latest changesGilbert Gonzales
2012-10-01CHUI-102: Cleaned up code after code review.Gilbert Gonzales
2012-09-28CHUI-102: Now the participants and one-on-one conversations have ↵Gilbert Gonzales
right-click-menus. These menus are functional as well, but 'chat history' does not yet work.
2012-09-28CHUI-349 (Crash when clicking on nearby chat toast):AlexanderP ProductEngine
removed a faulty method LLIMFloater::addToIMContainer; replaced it's calls to calls of its correct twin - LLIMFloater::addToHost
2012-09-10CHUI-268 (Transfer the common functionality from LLNearbyChat and ↵AlexanderP ProductEngine
LLIMFloater to LLIMConversation): moved appendMessage() to base class
2012-09-05CHUI-268 (Transfer the common functionality from LLNearbyChat and ↵AlexanderP ProductEngine
LLIMFloater to LLIMConversation): moved focusLost(), focusReceived and enable/disable of the call button to base class
2012-08-20Automated merge with ssh://hg.lindenlab.com/richard/viewer-chuiSeth ProductEngine
2012-08-16CHUI-120 WIP Notifications about added chat participants should be sent to ↵Seth ProductEngine
the conference when those participants actually join. - Removed notifying existing P2P participants about ad hoc conference staring in a new window. Now the notifications should arrive in that new window. - Fixed "Cancel" button which had no effect in adding P2P participants notification.
2012-08-15CHUI-286 (Conversations floater opened by default when a new IM session is ↵AlexanderP ProductEngine
started (no IM toast shown): now floater silently adds itself to the container
2012-08-10CHUI-120 WIP Different notifications about single and multiple chat ↵Seth ProductEngine
participants invited. The notification about starting a new conversation now applies only to P2P chat. Some code refactoring and clean up.
2012-08-09CHUI-120 WIP Added notifications about newly invited chat participants.Seth ProductEngine
2012-08-01CHUI-268 (Transfer the common functionality from LLNearbyChat and ↵AlexanderP ProductEngine
LLIMFloater to LLIMConversation): Remove duplication of functionality from LLNearbyChat; transfer mChatHistory, mInputEditor and some its settings and callbacks to the base class.
2012-07-27CHUI-151 FIXED (Implement conversation log)Paul ProductEngine
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-10CHUI-201 FIX for crash when leaving a voice call via the end call prompt.Seth ProductEngine
Fixed the problem with confirmLeaveCallCallback() firing after the chat floater is destroyed.
2012-07-03CHUI-186 CHUI-187 FIX Removing a P2P convrsation from converstaion widget in ↵Seth ProductEngine
the upper right corner when a new participant is added. End call prompt removed when adding a new participant to a P2P voice call. After adding a participant to a P2P voice conversation the resulting conference call is restarted voice invites to all participants.
2012-06-26CHUI-147 FIX Added updating conference participants in IM floater titleSeth ProductEngine
- The title is updated with the data from participants list widget in IM floater. - Creating the participants list is fixed for the case of starting the ad hoc session when the session id changes upon initialization (see LLIMConversation::buildParticipantList()). - LLEventTimer replaced with simple LLTimer to avoid crashes in LLEventTimer::tick(). - Moved the build_residents_string() code to LLAvatarActions::buildResidentsString() to use it in LLIMFloater::onParticipantsListChanged().
2012-06-22CHUI-160 FIXED (Text entered in local chat text field scrolls up and becomes ↵Paul ProductEngine
only partially visible after hitting return) - Replaced LLLineEditor with LLChatEntry in nearby chat - Moved reshape method from LLIMFloater to the base LLIMConversation so that vertical reshaping work properly for both LLNearbyChat and LLIMFloater
2012-06-19CHUI-127 FIXED (Make chat field auto resizable)Paul ProductEngine
- Replaced LLLineEditor with newly created LLChatEntry - Moved some functionality (such as setting label) to the LLTextBase as it can be useful to the other derived classes
2012-06-14CHUI-199 WIP Modified the nearby chat for using floater_im_session.xml; ↵AlexanderP ProductEngine
merging LLNearbyChatBar with LLNearbyChat; clean up code; supressed a double creation of LLNearbyChat
2012-06-13CHUI-120 WIP Modified chat participants drag and drop not to use LLClipboard.Seth ProductEngine
2012-06-08CHUI-120 WIP Added conversations participants drag and drop from avatar ↵Seth ProductEngine
lists to IM floaters. - Added new drag and drop type DAD_PERSON and source SOURCE_PEOPLE to avoid highliting the toolbars when using SOURCE_VIEWER. - Disabled calling card drop support as it is considered obsolete.
2012-06-08CHUI-120 WIP Added avatar picker that allows to add other users to an ↵Seth ProductEngine
existing chat if they don't participate in it already.
2012-06-07CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P ↵Seth ProductEngine
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-05-31CHUI-119 WIPSeth ProductEngine
2012-05-30CHUI-119 WIP Prepare the nearby chat for hosting it by the IM-containerAlexanderP ProductEngine
2012-05-18CHUI-105 WIP Minor code clean up and optimization.Seth ProductEngine
Removed overloaded updateTitleButtons() and moved its functionality to a new method that should be called less frequently.
2012-05-17CHUI-105 ADD. FIX Implement changes to all open conversations and nearby chatAlexanderP ProductEngine
2012-05-15CHUI-105 WIP Hide an additional close button for undocked state of an IM floaterAlexanderP ProductEngine
2012-05-14Formatting fixesAlexanderP ProductEngine
2012-05-14CHUI-113 WIP all voice controls is moved from a IM-control panel to the IM ↵AlexanderP ProductEngine
floater; IMControlPanel is removed; simplified voice button's listener behavior
2012-05-10CHUI-105 WIP Added expand/collapse behavior for Conversations floater ↵Seth ProductEngine
messages pane.
2012-05-08CHUI-103 FIXED Implemented switching text view modes from pop-up menuAlexanderP ProductEngine
2012-05-07CHUI-105 WIP Added tear-off and return behavior for IM floater.Seth ProductEngine
XUI changed for Converstions multifloater and IM floater.
2011-10-10EXP-1285 FIXED Chiclets moved to the upper right of the viewer window.Seth ProductEngine
- Floaters dock to chiclets at the bottom. - Floaters docking region limited to non-toolbar view. - Chiclet bar is positioned between the right toolbar and the minimized floaters stacked at the top left corner by default.
2011-09-29EXP-1209 FIXED Sidetray removed.Paul ProductEngine
- Removed all sidetray dependencies and the sidetray itself. - Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2010-12-24STORM-682 FIXED Fixed positioning notification toasts in mouse-look mode.Vadim ProductEngine
Toasts were positioned as if side tray was expanded. The fix is to reshape the so-called toasts screen channel (an area where toasts are drawn) on entering/leaving mouse-look mode, so that the screen channel can notice that side tray get in/visible.
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-06-21Merge with q/viewer-releaseLeyla Farazha