Commit Graph

24970 Commits (ae2e611dfb7b712c159ebafabb83ebbc1f7465b6)

Author SHA1 Message Date
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
Merov Linden e271c47994 Pull merge from richard/viewer-chui 2012-09-04 22:16:24 -07:00
Merov Linden 8cd5d36160 CHUI-285 : Create participant widgets in the conversation list 2012-09-04 22:11:28 -07:00
Gilbert Gonzales d41202336b CHUI-303: Problem was that the prior solution only updated (using dirtyFilter()) the inventory window that the paste occurred in. Resolution: Now each inventory window calls dirtyFilter(), which then determines visibility of the pasted item. 2012-09-04 14:21:25 -07:00
Gilbert Gonzales 5c14f6e783 merging in latest changes 2012-09-04 13:35:38 -07:00
Gilbert Gonzales 5fbb161ba0 CHUI-305: Now searching in the resident picker works. Problem: The resident picker search results were being sent to the old global resident picker. Now resident pickers are non-global and coupled to their parent floater. 2012-09-04 13:34:33 -07:00
Paul ProductEngine 7bad109c3d CHUI-314 FIXED (Update Save IM logs on my computer setting to also control populatoin of conversation log)
- Now LLConversationLog is optionally listener of IMSession, dependently on "LogInstantMessages" per account setting, saving of call log to file also depends on this setting.
Which means that with the Save IM logs on my computer disabled: IM logs for the user will not be saved to their computer and conversations will not be logged to the conversation log.
2012-09-03 17:52:54 +03:00
Paul ProductEngine eb13b2b468 CHUI-307 FIXED (LLInitParam::Parser::parserWarnings in log when adding conversations or deleting entries from conversation log )
- removed redundant incorrect attributes
2012-09-03 17:42:20 +03:00
Gilbert Gonzales 383f370884 merging in latest changes 2012-08-31 11:48:03 -07:00
Gilbert Gonzales 461550a8ff merging in latest changes 2012-08-31 11:02:14 -07:00
Paul ProductEngine 73769180f3 CHUI-298 FIXED (Conversation started as an IM and then goes to voice call does not show as call in conversation log)
- Show voice icon when call is started
- Added flag LLConversation::mIsConversationPast which means that this conversation is finished and any of its data can't be changed. I.e. it cannot be reused.
- When session removed (i.e. finished) corresponding conversation is marked as Past conversation. I.e. mIsConversationPast is true.
- Added changed(const LLUUID& session_id, U32 mask) method to LLConversationLog to notify particular conversation. This is used in LLConversationLogList to update its particular item and not to rebuild the whole list.
2012-08-31 19:22:41 +03:00
Paul ProductEngine c2bb1a189c CHUI-154 FIXED (Add link to chat preferences from Conversation floater)
- Added link to chat preferences from Conversation floater
2012-08-31 12:05:36 +03:00
Paul ProductEngine dab6788c42 CHUI-157 FIXED (Implement menu bar for conversation floater)
- Added View Nearby chat history option
- Also replaced menu item "Add Friend / Remove" with two separate menus: Add Friend and Remove Friend. So if user is a Friend the Remove Friend option would be shown there. If the user is not a friend, the Add Friend option would be shown.
2012-08-31 11:57:36 +03:00
Merov Linden ab37263a5c CHUI-285 : LLIMFloaterContainer is now using LLParticipantList fully 2012-08-30 21:34:48 -07:00
Gilbert Gonzales 1aadf94fe4 CHUI-305: Now the Region/Estate floater displays the frustum shadow when opening the Resident Picker. 2012-08-30 17:24:19 -07: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 73eec0321f merging in latest changes 2012-08-29 19:19:42 -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
Merov Linden 9ff67f4a04 CHUI-285 : WIP : Get the conversation floater to use the same LLParticipantList as the IM and call dialog 2012-08-29 18:27:21 -07:00
Merov Linden 01a154809d Pull merge from richard/viewer-chui 2012-08-29 10:45:32 -07:00
Merov Linden ca7abc4c3b CHUI-280 : Add print out debug methods 2012-08-29 10:07:55 -07:00
Merov Linden ad070b9155 CHUI-280 : Implement all LLConversationModel updates in LLParticipantList. Allow mAvatarList to be NULL. 2012-08-28 23:13:10 -07:00
Merov Linden c4638d1dca CHUI-280 : WIP : Implement update of LLConversationModel in LLParticipantList 2012-08-28 19:09:57 -07:00
Seth ProductEngine 051bc99573 CHUI-287 FIX IM toast panel is closed upon mouse up and doesn't pass the mouse click that activates "click to walk". 2012-08-28 20:08:17 +03:00
William Todd Stinson 11e9f66e62 BUILDFIX: Correcting a linux build error. 2012-08-28 12:41:57 -07: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
William Todd Stinson a1a1410d25 Skipping the realloc alignment test on Linux as the ll_aligned_malloc_16() function is not implemented to ensure alignment on Linux. 2012-08-27 18:16:47 -07:00
Merov Linden 99e0c35c40 Merge pull from richard/viewer-chui 2012-08-27 09:50:23 -07:00
AlexanderP ProductEngine 0804ecb355 removed debug messages 2012-08-27 17:41:37 +03:00
Merov Linden fd62242dd6 CHUI-280 : Make LLParticipantList derives from LLConversationItemSession 2012-08-24 17:31:12 -07:00
Gilbert Gonzales 31d69a6bc5 merging in latest changes 2012-08-24 13:57:57 -07:00
Gilbert Gonzales 6e92b96e88 kicking off another build (whitespace change) 2012-08-24 13:53:17 -07:00
Merov Linden b19e6c2959 Pull merge from richard/viewer-chui 2012-08-23 20:02:43 -07:00
Merov Linden e537d6477d CHUI-98 : Defining the various llconversation sub classes in their respective file 2012-08-23 19:44:10 -07:00
Merov Linden 15d957616e CHUI-282 : Use views for UI manipulation, not models 2012-08-23 16:11:08 -07:00
Gilbert Gonzales 5046e77d15 merging in latest changes. 2012-08-23 15:14:57 -07:00
Gilbert Gonzales 42701ad323 CHUI-303: Problem: When pasting the item, the item's filtering flag was not updated. The filtering flag determines visibility. Resolution: Upon pasting the item to the folder from the clipboard, update the filtering flag so that visibility can properly be determined. 2012-08-23 15:14:04 -07:00
Todd Stinson 6d84272d38 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-23 15:11:10 -07:00
Merov Linden ff95dd4a43 Merge pull from richard/viewer-chui 2012-08-23 11:34:56 -07:00
Merov Linden 4ea73df484 CHUI-282 : WIP : Further separate view from model for llconversation items 2012-08-23 11:32:20 -07:00
Paul ProductEngine 02e4068baa CHUI-306 FIXED (Selecting IM option for Group in conversation log does not start an IM if you did not initiate the conversation)
- To start group call or group chat, group_id should be passed as an argument to LLGrupActions, not participant_id.
2012-08-23 18:19:13 +03:00
Paul ProductEngine 41c85d357c CHUI-296 FIXED (Unread IM messages icon not showing in conversation log)
- Sometimes IM floater with offline unread messages is visible but not in visible chain and the flag of offline unread messages is erroneously reset.
So made condition of whether floater is visible more strict.
2012-08-23 18:07:35 +03:00
Merov Linden 679d0f78f9 CHUI-282 : WIP, Clean up dependencies 2012-08-22 23:14:01 -07:00
Merov Linden 2cf5307c92 CHUI-282 : WIP : Isolated llconversationview classes and suppressed the dependency of model to widgets 2012-08-22 19:29:22 -07:00
Oz Linden fcfc686d9c Added tag 3.4.0-beta4 for changeset 84fb70dfe344 2012-08-22 17:08:49 -04:00
AlexanderP ProductEngine 14708a3ace CHUI_310 make NearbyChat a singletone 2012-08-22 18:27:29 +03:00
Oz Linden 5c4babf0fd merge changes for DRTVWR-201 2012-08-22 11:12:55 -04:00
Oz Linden 0e4fa75e64 tag merge of DRTVWR-201 2012-08-22 11:12:53 -04:00
Oz Linden e4b553075e merge changes for 2012-08-22 10:51:52 -04:00
AlexanderP ProductEngine b2f2a8b216 code style fix 2012-08-22 14:48:44 +03:00