summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
AgeCommit message (Collapse)Author
2012-11-16CHUI-518: FIX Removing the LLIMMgr::getInstance() as the containing method ↵William Todd Stinson
is already a non-static member method of the same class.
2012-11-16Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-11-15CHUI-518: WIP First pass as implementing auto-reject voice calls in do not ↵William Todd Stinson
disturb mode.
2012-11-15merging in latest changesGilbert Gonzales
2012-11-15CHUI-489: Now sounds exist for teleport and inventory offers. The sound is ↵Gilbert Gonzales
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-14CHUI-389 FIXED Added parameter for sessionAdded to get access to ↵maxim_productengine
has_offline_msg value. Set UnreadIMs icon to visible if messages were sent while offline.
2012-11-13CHUI-486: Post code review changes for last submit, just added in some ↵Gilbert Gonzales
parenthesis for conditional statements, thus making them more clear.
2012-11-13merging in latest changesGilbert Gonzales
2012-11-13CHUI-486: Code cleanup, instead of using values such as 0, 1, 2 now using ↵Gilbert Gonzales
strings 'toast', 'flash', 'none'. These values are used whether to show a notification or not.
2012-11-13CHUI-447 FIXED Set session name as avatar's display name, if session is ↵maxim_productengine
created by getting new message.
2012-11-12CHUI-486: Now toasts only appear when proper 'Chat Preference' setting is ↵Gilbert Gonzales
set to 'Pop Up Message'.
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 and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-11-08CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now ↵William Todd Stinson
refers to it as Do Not Disturb mode.
2012-11-08CHUI-387 FIXED (Conversation toasts not shown for open conversations when ↵AlexanderP ProductEngine
conversation floater is in a minimized state or undocked conversation is minimized): added checking of the minimized state
2012-10-24CHUI-449: Problem: When a toast was clicked, the conversation floater was ↵Gilbert Gonzales
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-22CHUI-433: Implemented an alternate solution to the problem. The original ↵Gilbert Gonzales
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-19CHUI-433: Problem: Toasts were not being displayed due to incorrect tracking ↵Gilbert Gonzales
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-15merging in latest changesGilbert Gonzales
2012-10-15CHUI-380: Final commit for this issue. After code review changed some method ↵Gilbert Gonzales
names to be more accurate. Also using dynamic_cast instead of static_cast for safety.
2012-10-12CHUI-380: (In progress) Refactoring needed to fix focusing issues when ↵Gilbert Gonzales
selecting an existing conversation item. This commit resolves re-introducing bug CHUI-289. Will code review and cleanup code in next commit.
2012-10-12CHUI-385 FIXED All user's do not receive ad hoc messages after adding a user ↵maksymsproductengine
to a conversation
2012-10-11CHUI-356 FIXED Call notifyObserverSessionIDUpdated() only after initing IM ↵maxim_productengine
floater with new session id
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-09-18CHUI-339 FIXED (2 entries shown in conversation log for ad hoc conference ↵Paul ProductEngine
for user that starts the conference)
2012-08-31CHUI-315 (Nearby chat messages do not appear in conversation floater): ↵AlexanderP ProductEngine
cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it.
2012-08-28CHUI-275 FIXED (Chat history viewer does not show entire user.txt IM log file)Paul ProductEngine
- 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-22CHUI_310 make NearbyChat a singletoneAlexanderP ProductEngine
2012-07-27Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.Todd Stinson
2012-07-27Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
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-04CHUI-195 FIXED Starting ad-hoc conference call does not open Conversations ↵AlexanderP ProductEngine
floater
2012-06-22CHUI-100 Fix floater's keyAlexanderP ProductEngine
2012-06-20CHUI-125 FIXED if a call is accept then open im-session's floaterAlexanderP ProductEngine
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-17CHUI-105 ADD. FIX Implement changes to all open conversations and nearby chatAlexanderP ProductEngine
2012-04-26Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2012-04-17Mac build fix.Seth ProductEngine
2012-04-02MAINT-180 FIXED Reject group and ad-hoc chat messages from lindens when we ↵Vadim ProductEngine
are busy.
2012-03-09merge changes for vmrg-225Oz Linden
2012-01-23STORM-1795 Small logic/formatting changeJonathan Yap
2012-01-20STORM-1795 Fixed misspelled variableJonathan Yap
2012-01-20STORM-1795 Fix logic errorJonathan Yap
2012-01-20EXP-901 FIXED (Can see "typing" messages from users who are not allowed to ↵Paul ProductEngine
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-16STORM-1795 Ad-hoc messages are received even when "Only friends and groups ↵Jonathan Yap
can call or IM me"
2011-12-12STORM-1731 Adjusted if muted logic slightlyJonathan Yap
2011-12-12STORM-1731 Changes per RB comments: changed llwarns to llinfos, added check ↵Jonathan Yap
so you cannot mute a Linden
2011-12-12STORM-1731 Ad-hoc confererence block failing. Residents using it to start ↵Jonathan Yap
massive multi-sim conferences, used as a griefing tool.