Commit Graph

203 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
AndreyL ProductEngine 3723934045 MAINT-4081 FIXED When removing a friend, the dialog now mentions complete name 2014-05-23 17:57:40 +03:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
maxim_productengine 849ce1e30c MAINT-423 FIXED Unminimize session floater and select this session when sharing initiated. 2014-05-06 11:28:13 +03:00
Xiaohong Bao ae564140c0 Merge 2014-04-22 12:19:28 -06:00
simon fdb28bccb9 Merge downstream code 2014-04-21 13:04:07 -07:00
Mnikolenko ProductEngine 73ef754986 MAINT-2376 FIXED Centre the map on friend's location 2014-03-26 11:10:26 +02:00
Merov Linden 2776f8ac48 MAINT-3320 : Make inbox (Received Items) more resilients to deletion while we're at it 2013-11-25 17:19:48 -08:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Oz Linden d43a302eaf MAINT-3075: don't display the target user name as a SLURL in the RequestTeleport dialog 2013-08-29 16:51:59 -04:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Jonathan Yap 9e5dbcfde5 STORM-1838 Add display name handling to the initial notification 2013-07-29 13:52:48 -04:00
Jonathan Yap 9b1840c1c9 STORM-1838 Added teleport request to conversation log. Added xml to have message appear in IM window, if open. Code cleanup. 2013-06-06 16:34:24 -04:00
Jonathan Yap ec52db8d0c STORM-1838 Slowly reappling changes to work with CHUI 2013-06-05 17:32:10 -04:00
Oz Linden ed7785bf97 merge up to 3.5.0-beta3 (chui) 2013-03-18 14:30:57 -04:00
Mnikolenko ProductEngine d81226f170 CHUI-809 FIXED Changes in menu items to make them consistent. Do not start IM if selected person is self. 2013-03-12 15:38:10 +02:00
maksymsproductengine 4b6e1c26f0 CHUI-633 FIXED User is not able to open chat history by 'View chat history' menu item from pop-up menu of People floater 2013-02-22 17:08:33 +02:00
Cho 4f0237007a CHUI-647 FIX "Conversations" floater is not opened when user wants to share something via "Conversation log" floater
Added call to show conversations floater in LLAvatarActions::share
2013-01-30 02:54:59 +00:00
Jonathan Yap 0afbc85efa STORM-1838 Minor UI improvements and code changes 2013-01-25 06:23:56 -05:00
Jonathan Yap 12182d7cc3 STORM-1838 Break out a large block of code from handle_lure_callback so it can be called directly by teleport_request_callback. 2013-01-24 15:29:36 -05:00
Jonathan Yap f64e11dfe1 STORM-1838 Add optional message processing 2013-01-24 14:27:10 -05:00
Oz Linden 3e3fda589b merge up to 3.4.4-release 2013-01-18 16:37:07 -05:00
Jonathan Yap 70722454f6 STORM-1838 Removed block of commented out code 2013-01-18 05:40:17 -05:00
Jonathan Yap e386aa73b7 STORM-1838 2013-01-11 11:13:44 -05:00
Merov Linden 3d137bae5c Merge with viewer-chui 2012-12-17 19:29:35 -08:00
Merov Linden 6fe7144104 CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary 2012-12-17 18:59:01 -08:00
Merov Linden 08cc82ec48 CHUI-599 : Fixed : Avatar name provides now a method to get the regular account name. 2012-12-13 22:45:47 -08:00
Merov Linden 3a49beed0e CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up. 2012-12-05 20:25:46 -08:00
MaximB ProductEngine d9ad200553 CHUI-544 (Legacy name shows in conversation list for user that answers a voice call) 2012-11-27 17:55:50 +02:00
maxim_productengine b87974df51 CHUI-447 Additional fix(Show only display name for user that starts conversation ) 2012-11-20 15:18:19 +02: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 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
Gilbert Gonzales 1a1a0b91c0 CHUI-383: Realized that prior changes for this bug caused a regress. The regress was using the people panel or a notecard to start a im/call with a user. When doing this the conversation line item would not be focused. Resolution: Changed all calls to LLIMFloater::show() to LLIMFloaterContainer::showConversation(), which will first select the conversation line item and then show the corresponding conversation floater. 2012-10-26 16:49:22 -07:00
Merov Linden 1006e2fd25 CHUI-422 : Update the ad-hoc conversation with the known list of on line agents without waiting for server message (which often doesn't come...). 2012-10-17 17:14:44 -07:00
Merov Linden 1557bffb56 MAINT-1551 : WIP : Added a hack : send an accept invitation message so to trigger the sending of the agent list. 2012-10-15 19:44:14 -07:00
Merov Linden a8c443feb2 MAINT-1551 : WIP : More IM comm tracing and attempt to fix 2012-10-15 14:29:57 -07:00
Merov Linden 0d619bcdc1 CHUI-147 : Sort the residents names when getting a resident string list 2012-10-08 18:20:37 -07:00
Merov Linden db452823e5 CHUI-194 : WIP : Update the ad-hoc conversation line item title, add a new update_session event. Still some clean up to do. 2012-10-05 20:28:11 -07:00
maksymsproductengine f2510ca0d6 CHUI-165 FIXED Add access to Conversation Log and Chat History from the People floater:
the 'View Chat History' action was updated;
2012-10-04 02:26:48 +03:00
maksymsproductengine 483cbd74d7 CHUI-165 FIXED Add access to Conversation Log and Chat History from the People floater. 2012-09-27 20:09:22 +03:00
Gilbert Gonzales d67c295d8b CHUI-305: Minor changes after code review. Using templated findChild() instead of getChildView(). Also using settings.xml to store common custom variables. 2012-08-30 16:20:27 -07:00
Gilbert Gonzales be61b5be2f CHUI-305: Problem: The 'resident picker' had multiple parents and due to the design of the resident picker it can have only one parent. Having multiple parents caused both parents to fight for depth ordering...which caused the flickering. Resolution: Now multiple 'resident pickers' can exist and they are coupled to the floater that spawned then. Meaning that when the parent floater closes, the 'resident picker' floater will also close. In addition, a shadow frustum eminates from the button that opened the 'resident picker'. 2012-08-29 19:18:25 -07:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Merov Linden 550c6e3694 Pull from richard/viewer-chui 2012-07-09 18:02:19 -07:00
Seth ProductEngine ad1f2eb510 CHUI-186 CHUI-187 FIX Removing a P2P convrsation from converstaion widget in 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-07-03 22:31:58 +03:00
Richard Linden 86471b92a0 Pull merge from richard/viewer-chui 2012-07-02 18:01:37 -07:00
Seth ProductEngine 0cfea7b406 CHUI-147 FIX Added updating conference participants in IM floater title
- 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-26 01:38:59 +03:00
Richard Linden 9e49fb558f CHUI-101 WIP Make LLFolderview general purpose
added more casts to LLFolderViewModelItemInventory, etc. to fix compile errors
2012-06-19 22:36:12 -07:00
Richard Linden 379eec8841 CHUI-101 WIP Make LLFolderView general purpose
continuing fixing build errors
renamed llfoldervieweventlistener.h to llfolderviewmodel.h
2012-06-15 13:35:39 -07:00
Richard Linden 86103dd5d4 Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui-folderview 2012-06-15 09:56:47 -07:00