summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-09-14CHUI-282 WIP Removed the hack added for CHUI-308 to resize the folder view ↵Seth ProductEngine
in conversation list. Fixed some glitches after automated merge.
2012-09-13Automated merge with ssh://hg.lindenlab.com/richard/viewer-chuiSeth ProductEngine
2012-09-13CHUI-282 WIP Fixed conversation list items selection.Seth ProductEngine
Fixed displaying session participants only when session item is open.
2012-09-13CHUI-334 FIXED (Date not shown in the chat log for current date entries)Paul ProductEngine
Before the "%Y/%m/%d" was always cutted from timestamp string for today's date. Now I added flag whether we should cut off timestamp or not.
2012-09-13CHUI-332 [Overlap of icons in chrome when collapsing and expanding ↵AlexanderP ProductEngine
conversation list]: force header resizing after show/hide minimize button
2012-09-13CHUI-321 FIXED (Indicate within the Call Log why there's nothing in it)Paul ProductEngine
I. On "LogInstantMessages" variable set to false: 1. save call log to file 2. clear call log 3. show message: "Conversations are not being logged. To log conversations in the future, select "Save IM logs in my computer" under Preferences > Privacy." On "LogInstantMessages" set to true: 1. clear message 2. reload all saved call log entries II. Refactored the way LLConversationLog reacts on "LogInstantMessages" value change
2012-09-12Pull merge from richard/viewer-chuiMerov Linden
2012-09-12CHUI-308 : Temp fix while waiting for a scroll container to be implementedMerov Linden
2012-09-12CHUI-335 FIXED (Alpha text allowed in page spinner in chat history viewer)Paul ProductEngine
- Added XML parameter "allow_digits_only" to spinner control widget, which disables/enables ability to input alpha text. - Disabled ability to enter alpha text in page spinner in chat history viewer
2012-09-11CHUI-336 FIXED (Remove Description label and field from Chat history viewer)Paul ProductEngine
- Removed lineeditor and text box from code and xml
2012-09-11CHUI-326 FIXED (One entry per conversation with a user in conversation log ↵Paul ProductEngine
timestamped with most recent utterance/activity.) - Modified LLConversationLog to show only one entry per conversation with user. I.e. there can't be two conversations with the same session_id in LLConversationLog. - Got rid of processing voice sessions - Refactored creation of conversation in LLConversationLog - Refactored a little bit LLConversation and LLConversationLog: function names and made some functions private
2012-09-10Attempt to fix Linux buildMerov Linden
2012-09-10Pull merge from richard/viewer-chuiMerov Linden
2012-09-10CHUI-282 WIP Modified conversation view item and IM floater container so ↵Seth ProductEngine
that the folder view handles the positioning of items in conversations list.
2012-09-10CHUI-332 (Overlap of icons in chrome when collapsing and expanding ↵AlexanderP ProductEngine
conversation list) changed expanded_min_dim of the right panel
2012-09-10CHUI-333 (Icons overlap in message panel when maximizing width of ↵AlexanderP ProductEngine
conversation list): increaced expanded_min_dim for the message pane
2012-09-09Pull merge richard/viewer-chuiMerov Linden
2012-09-09CHUI-285 : Complete. Fix participants repositioning.Merov Linden
2012-09-07CHUI-285 : Implement sort, alphabetical only for the momentMerov Linden
2012-09-07CHUI-325 FIXED (Cap conversation log to 30 days, purge older data on login)Paul ProductEngine
- Remove conversations older than 30 days from call log
2012-09-07CHUI-323 FIXED (Local chat message panel out of position in Conversation ↵AlexanderP ProductEngine
floater): Prevented too early creation LLNearbyChat
2012-09-10CHUI-268 (Transfer the common functionality from LLNearbyChat and ↵AlexanderP ProductEngine
LLIMFloater to LLIMConversation): moved appendMessage() to base class
2012-09-06Pull merge from richard/viewer-chuiMerov Linden
2012-09-06CHUI-285 : Completed. Update the names of the participants.Merov Linden
2012-09-06CHUI-318 FIXED (User cannot navigate forward in chat history viewer once the ↵Paul ProductEngine
More History option is selected.) - Added spinner so that user could select desired history page. Also displaying total count of pages.
2012-09-06CHUI-324 FIXED (No sort order field set by default in conversation log)Paul ProductEngine
- Corrected value in settings XML
2012-09-06CHUI-320 FIXED (Inconsistent name formatting in conversation log depending ↵Paul ProductEngine
if user started conversation or not) - On P2P session started, before creating entry of conversation log, requesting avatar name in form of Display Name (user.name)
2012-09-06CHUI-319 FIXED ("User has said something new" text shown when navigating ↵Paul ProductEngine
chat history with More History button) - Added flag to chat history whether to show notification about unread messages or not
2012-09-05CHUI-285 : Clear the needs refresh flag when refreshing, comment clean up.Merov Linden
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-09-04Pull merge from richard/viewer-chuiMerov Linden
2012-09-04CHUI-285 : Create participant widgets in the conversation listMerov Linden
2012-09-04CHUI-303: Problem was that the prior solution only updated (using ↵Gilbert Gonzales
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-04merging in latest changesGilbert Gonzales
2012-09-04CHUI-305: Now searching in the resident picker works. Problem: The resident ↵Gilbert Gonzales
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-04CHUI-311 FIXED (Make conversation list panel size persist between sessions): ↵AlexanderP ProductEngine
save current width in the setting_per_account.xml
2012-09-03CHUI-314 FIXED (Update Save IM logs on my computer setting to also control ↵Paul ProductEngine
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-03CHUI-307 FIXED (LLInitParam::Parser::parserWarnings in log when adding ↵Paul ProductEngine
conversations or deleting entries from conversation log ) - removed redundant incorrect attributes
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-315 (Nearby chat messages do not appear in conversation floater): ↵AlexanderP ProductEngine
cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it.
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