summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-09-12MAINT-1503 Minimal set of changes needed to safely disable tcmallocDave Parks
2012-09-12Fixing merge conflicts related to restoring DRTVWR-167 changesBrad Payne (Vir Linden)
2012-09-12initial attempt to restore changes that make removing tcmalloc possible; not ↵Oz Linden
tested
2012-09-11merge changes for DRTVWR-213Oz Linden
2012-09-10Fixed line endings from DOS to UNIX.Baker Linden
2012-09-10FIX INTL-104 Translation of Set34 in 8 languages, including Steam contenteli
2012-09-10FIX INTL-106 French linguistic fixeseli
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-08DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
cmake and other files didn't get moved over, do it by hand.
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Cmake files not merged correctly and had to be done by hand. New memory allocation made some memory usage tests in the llcorehttp integration tests no longer valid. Would like to work on LLLog sometime and get it to be consistent. Special flags needed for windows build of example program.
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-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-06Do the proper fix this time...Baker Linden
2012-09-06Added explicit casting for Linux build, hopefully making it work.Baker Linden
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-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-08-31- Fixed an issue where service was called twice in a frameChris Baker
- Changed level of output logs - Cleaned up comments
2012-08-31merge changes forOz 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
2012-08-29WIP INTL-46 Traditional Chinese translation for Set23TW (120829)eli
2012-08-29MAINT-1455 FIX Media Texture not visually updated correctlycallum
Reviewed by me. (Bao created)
2012-08-28Got viewer displaying new data formatChris Baker
2012-08-27MAINT-1480: Ensuring that the new angular velocity is remembered for later ↵William Todd Stinson
comparison to the previous angular velocity.
2012-08-27PATH-868: Ensuring that walkability values are reset to a previous value if ↵Todd Stinson
the empty string is entered.
2012-08-27MAINT-1480: Clearing the angular velocity accummulation when the updated ↵Todd Stinson
angular velocity is set to zero.
2012-08-23Start of getting WSGI service on viewerChris Baker
2012-08-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-22PATH-864: Altering the minimum linksets floater size to smaller to allow ↵Todd Stinson
fitting to 1024 width screens.
2012-08-22merge changes for DRTVWR-202Oz Linden
2012-08-22Fix up white space to follow coding policy guidelinescallum_linden
2012-08-22pull back release hotfix and beta fixesOz Linden
2012-08-22merge changes for DRTVWR-201Oz Linden
2012-08-22merge changes forOz Linden
2012-08-22merge changes for DRTVWR-203Oz Linden
2012-08-22merge back 3.4.0-beta3 fixesOz Linden
2012-08-21Pointless edit to tickle TC/codeticket.Monty Brandenberg
2012-08-21SH-3325 texture load slow on some machinesMonty Brandenberg
This doesn't really address 3325 directly but it is the result of research done while hunting it down. First, this is a thread safety improvement for canceled requests that have gone into resource wait state. I don't think we've seen a failure there but there was a window. It also cleans the resource wait queue earlier which lets us do less work and get requests more quickly into llcorehttp by bypassing the resource wait state. With this, I finally feel comfortable about rundown of requests.
2012-08-21storm-1906: correct cmake error when using precompiled llphysicsextensions_tpvOz Linden
2012-08-20merge back beta fixesOz Linden
2012-08-19SH-3329 Cached scene loads slower than same scene with cleared cache.Monty Brandenberg
A/B comparison with original code showed the newer issuing lower-priority requests of the cache reader and some other minor changes. Brought them into agreement (this is cargo-cult programming). Made the HTTP resource semaphore an atomic int for rigorous correctness across threads. I swear I'm going to tear down this code someday.
2012-08-17MAINT-1439: BUGFIX Correcting Kart 1.0 issue with physical objects using ↵Todd Stinson
angular velocity.
2012-08-17SH-3328 llcorehttp tracing control needed defensive logic for missing settingMonty Brandenberg
Guard for the typical case of a missing setting with a bracketing gSavedSettings.controlExists() call.
2012-08-17SH-3327 HTTP transfers not showing up in texture console 'net tot tex' value.Monty Brandenberg
Dropped an argument during integration which made the total byte count read lower than expected. Everything else is fine, however.
2012-08-17Minor change required for merge from viewer-developmentAura Linden
2012-08-17SH-3328 Permanently add 'QAModeHttpTrace' setting to control llcorehttp ↵Monty Brandenberg
trace functionality llcorehttp implements a nice trace facility but it hasn't been attached to an external control to date. This hands over control to a *non-persistent* setting that can be used for QA or field diagnostics.
2012-08-17Merged in from viewer-development.Aura Linden