summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-06Pull merge from richard/viewer-chuiMerov Linden
2012-09-06CHUI-285 : Completed. Update the names of the participants.Merov Linden
2012-09-06Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-06Do the proper fix this time...Baker Linden
2012-09-06Added explicit casting for Linux build, hopefully making it work.Baker 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-06Mergesimon@Simon-PC.lindenlab.com
2012-09-06DRTVWR-232: MAINT-1440: FIXED Call Tools.TakeCopy instead of ↵maxim_productengine
InspectObject.TakeFreeCopy
2012-09-06MAINT-1440 FIXED Call Tools.TakeCopy instead of InspectObject.TakeFreeCopymaxim_productengine
2012-09-06MAINT-1183 FIXED Tooltip text is changedmaxim_productengine
2012-09-05CHUI-285 : Clear the needs refresh flag when refreshing, comment clean up.Merov Linden
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-05[MAINT-513] Large group managementBaker Linden
- Reduced the timeout to 5 minutes, down from 10 minutes. - Provided output for GroupMemberResponder error - Removed commented calls to sendGroupMembersRequest - Reordered calls to sendCapGroupMembersRequest so it's called last
2012-09-05Reapply f6ed57210865 to zh/notifications.xml: remove "FirstRun" link.Nat Goodspeed
Because create_account_url should vary between viewer languages and skins, we've made an effort to ensure that create_account_url is used everywhere, instead of directly embedding http://join.secondlife.com. Recent rev 6ee71714935f accidentally reinserted the link embedded in the "FirstRun" notification for language 'zh'. Delete it again.
2012-09-05Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
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-04WIP INTL-46 Set25, Set26, Set27 translations for traditional chinese; add ↵eli
new files
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-04viewer-development mergeChris Baker
2012-09-04Cleaned up commentsChris Baker
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-04merge changes for DRTVWR-207Oz Linden
2012-09-04merge changes for DRTVWR-206Oz Linden
2012-09-04tag merge of DRTVWR-206Oz Linden
2012-09-04MAINT-1502 User is unable to rename script inside content of object:MaksymS ProductEngine
- regression after wrong merge, full fix was done in MAINT-1228;
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-31- Fixed an issue where service was called twice in a frameChris Baker
- Changed level of output logs - Cleaned up comments
2012-08-31MAINT-1503 Fix for ll_aligned_realloc returning non-aligned pointers on linuxDave Parks
2012-08-31merge changes forOz Linden
2012-08-31MAINT-1503 Fix for ll_aligned_realloc returning non-aligned pointers on linuxDave Parks
2012-08-31mergeDave Parks
2012-08-31MAINT-1503 Disable tcmalloc and fix remaining alignment issues.Dave Parks
2012-08-31Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
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-31Copy sourceid= from create_account_url to login-page URL.Nat Goodspeed
This allows the login-page server to respond to any sourceid= associated with the create_account_url, which (we happen to know) varies by skin -- e.g. for the Steam viewer.
2012-08-31Now that LLURI isn't broken, use it to construct login-page URL.Nat Goodspeed
Previous logic constructed a std::ostringstream, directly messing with '?' vs. '&', ugly libcurl escape calls etc. Now we can deconstruct the LLGridManager:: getLoginPage() URL, supplement the params map as needed and then rebuild a new URL using LLURI::buildHTTP().
2012-08-31Fix longstanding LLURI::buildHTTP() bug when passing string path.Nat Goodspeed
The LLURI::buildHTTP() overloads that take an LLSD 'path' accept 'undefined', LLSD::String and (LLSD::Array of LLSD::String). A sequence of path components passed in an Array is constructed into a slash-separated path. There are unit tests in lluri_test.cpp to exercise that case. To my amazement, there were NO unit tests covering the case of an LLSD::String path. The code for that case escaped and appended the entire passed string. While that might be fine for a 'path' consisting of a single undecorated path component, the available documentation does not forbid one from passing a path containing slashes as well. But this had the dubious effect of replacing every slash with %2F. In particular, decomposing a URL string with one LLURI instance and constructing another like it using LLURI::buildHTTP() was not symmetrical. Having consulted with Richard, I made the string-path logic a bit more nuanced: - The passed path string is split on slashes. Every path component is individually escaped, then recombined with slashes into the final path. - Duplicate slashes are eliminated. - The presence or absence of a trailing slash in the original path string is carefully respected. Now that we've nailed down how it ought to behave -- added unit tests to ensure that it DOES behave that way!!
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-31Added tag 3.3.4-release3 for changeset 351eea5f9dc1Oz Linden
2012-08-31tag merge of DRTVWR-207Oz Linden