summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-07Further attempts to erradicate TCMALLOCsimon@Simon-PC.lindenlab.com
2012-09-07MAINT-1494 : Viewer needs new localizable stringssimon@Simon-PC.lindenlab.com
2012-09-07DRTVWR-209 Additional merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Restore original deleteRequest/removeRequest implementation removing a small race. Remove a short-lived additional timeout scheme on requests which really isn't appropriate as originally implemented as we can have very long-lived requests on big regions.
2012-09-07Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-07MAINT-1503 Fix for linux buildDave Parks
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
This was yet another refresh from v-d because of significant changes to lltexturefetch that would not have been resolvable by casual application of any merge tool. There are still a few questions outstanding but this is the initial, optimistic merge.
2012-09-07MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS XDave Parks
2012-09-07Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
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-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-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-04WIP INTL-46 Set25, Set26, Set27 translations for traditional chinese; add ↵eli
new files
2012-09-04viewer-development mergeChris Baker
2012-09-04Cleaned up commentsChris Baker
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-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-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-31Added tag 3.3.4-release3 for changeset 351eea5f9dc1Oz Linden
2012-08-31tag merge of DRTVWR-207Oz Linden
2012-08-31MAINT-284 FIXED setVisbible(true) after openFloater to allow make_ui_soundmaxim_productengine
2012-08-31MAINT-1471 FIXED Disable "Share" menu item if there is no item selected in ↵maxim_productengine
active panel
2012-08-30MAINT-1486 FIX Crash on login (Unhandled exception)Richard Linden
open root timer by default
2012-08-30MergeRichard Linden
2012-08-30MAINT-1486 FIX Crash on login (Unhandled exception)Richard Linden
cleaner implementation of llfasttimers...don't bother to share similarly named timers just create multiple timers with same name...doesn't break anything
2012-08-30MAINT-1486 FIX Crash on login (Unhandled exception)Richard Linden
removed checkforDuplicates since we support duplicates again
2012-08-30Automated merge with https://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-08-30MAINT-1486 FIX Crash on login (Unhandled exception)Richard Linden
allow duplicate named fast timers again, refactored timer code
2012-08-31MAINT-1486 FIXED Crash on login (Unhandled exception)MaksymS ProductEngine
2012-08-30Added tag 3.4.0-beta5 for changeset 573e863be2f2Oz Linden
2012-08-30WIP INTL-46 Set24 translation for traditional chinese; add new files; remove ↵eli
obsolete files
2012-08-30FIX INTL-101 translation of set33 for 8 languages; add new files; remove ↵eli
obsolete files