summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-08-31merging in latest changesGilbert Gonzales
2012-08-31merging in latest changesGilbert Gonzales
2012-08-31CHUI-298 FIXED (Conversation started as an IM and then goes to voice call ↵Paul ProductEngine
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-31CHUI-154 FIXED (Add link to chat preferences from Conversation floater)Paul ProductEngine
- Added link to chat preferences from Conversation floater
2012-08-31CHUI-157 FIXED (Implement menu bar for conversation floater)Paul ProductEngine
- 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-30CHUI-285 : LLIMFloaterContainer is now using LLParticipantList fullyMerov Linden
2012-08-30CHUI-305: Now the Region/Estate floater displays the frustum shadow when ↵Gilbert Gonzales
opening the Resident Picker.
2012-08-30CHUI-305: Minor changes after code review. Using templated findChild() ↵Gilbert Gonzales
instead of getChildView(). Also using settings.xml to store common custom variables.
2012-08-29merging in latest changesGilbert Gonzales
2012-08-29CHUI-305: Problem: The 'resident picker' had multiple parents and due to the ↵Gilbert Gonzales
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-29CHUI-285 : WIP : Get the conversation floater to use the same ↵Merov Linden
LLParticipantList as the IM and call dialog
2012-08-29Pull merge from richard/viewer-chuiMerov Linden
2012-08-29CHUI-280 : Add print out debug methodsMerov Linden
2012-08-28CHUI-280 : Implement all LLConversationModel updates in LLParticipantList. ↵Merov Linden
Allow mAvatarList to be NULL.
2012-08-28CHUI-280 : WIP : Implement update of LLConversationModel in LLParticipantListMerov Linden
2012-08-28CHUI-287 FIX IM toast panel is closed upon mouse up and doesn't pass the ↵Seth ProductEngine
mouse click that activates "click to walk".
2012-08-28BUILDFIX: Correcting a linux build error.William Todd Stinson
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-27Skipping the realloc alignment test on Linux as the ll_aligned_malloc_16() ↵William Todd Stinson
function is not implemented to ensure alignment on Linux.
2012-08-27Merge pull from richard/viewer-chuiMerov Linden
2012-08-27removed debug messagesAlexanderP ProductEngine
2012-08-24CHUI-280 : Make LLParticipantList derives from LLConversationItemSessionMerov Linden
2012-08-24merging in latest changesGilbert Gonzales
2012-08-24kicking off another build (whitespace change)Gilbert Gonzales
2012-08-23Pull merge from richard/viewer-chuiMerov Linden
2012-08-23CHUI-98 : Defining the various llconversation sub classes in their ↵Merov Linden
respective file
2012-08-23CHUI-282 : Use views for UI manipulation, not modelsMerov Linden
2012-08-23merging in latest changes.Gilbert Gonzales
2012-08-23CHUI-303: Problem: When pasting the item, the item's filtering flag was not ↵Gilbert Gonzales
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-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-23Merge pull from richard/viewer-chuiMerov Linden
2012-08-23CHUI-282 : WIP : Further separate view from model for llconversation itemsMerov Linden
2012-08-23CHUI-306 FIXED (Selecting IM option for Group in conversation log does not ↵Paul ProductEngine
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-23CHUI-296 FIXED (Unread IM messages icon not showing in conversation log)Paul ProductEngine
- 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-22CHUI-282 : WIP, Clean up dependenciesMerov Linden
2012-08-22CHUI-282 : WIP : Isolated llconversationview classes and suppressed the ↵Merov Linden
dependency of model to widgets
2012-08-22Added tag 3.4.0-beta4 for changeset 84fb70dfe344Oz Linden
2012-08-22CHUI_310 make NearbyChat a singletoneAlexanderP ProductEngine
2012-08-22merge changes for DRTVWR-201Oz Linden
2012-08-22tag merge of DRTVWR-201Oz Linden
2012-08-22merge changes forOz Linden
2012-08-22code style fixAlexanderP ProductEngine
2012-08-21CHUI-297 FIXED (Double clicking line item in conversation log does not start ↵Paul ProductEngine
IM with User) - Added callback on double click which initiates IM session with selected conversation log list item
2012-08-21CHUI-300 FIXED (Simplify conversation log name saved to user settings?)Paul ProductEngine
- Changed file name agentID#.call_log to conversation.log
2012-08-21CHUI-293 CHUI-294 FIXED displaying Group Invite and Transfer Object as ↵Seth ProductEngine
notifications, instead of displaying as messages from an object. Restored the exception in handling "LoadWebPage", "ScriptDialog" and "ScriptDialogGroup" notifications, that caused only those notifications to be shown as messages from an object.
2012-08-21Automated merge with ssh://hg.lindenlab.com/richard/viewer-chuiSeth ProductEngine
2012-08-21storm-1906: correct cmake error when using precompiled llphysicsextensions_tpvOz Linden
2012-08-20Added tag 3.4.0-beta3 for changeset 182a9bf30e81Oz Linden
2012-08-20tag merge of DRTVWR-200Oz Linden
2012-08-20Automated merge with ssh://hg.lindenlab.com/richard/viewer-chuiSeth ProductEngine