summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-04merge changes for DRTVWR-207Oz Linden
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-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-203Oz Linden
2012-08-22merge back 3.4.0-beta3 fixesOz Linden
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-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
2012-08-16merge changes for DRTVWR-197Oz Linden
2012-08-16PATH-852: Attempting to fix the format of the BMP cursors for linux.Todd Stinson
2012-08-16Silly Python 'string' fixcallumprentice
2012-08-16Silly Python 'string' fixcallumprentice
2012-08-16Silly typo fixcallumprentice
2012-08-16merge changes for storm-1895Oz Linden
2012-08-16merge changes for storm-1898Oz Linden
2012-08-16merge up to latest viewer-developmentOz Linden
2012-08-15Add explicit reference to keychain to usecallumprentice
2012-08-15silly typo - change language from dutch to english :)callumprentice
2012-08-15Changed name of keychain to match setup instructionscallum_linden
2012-08-15merge changes for DRTVWR-194Oz Linden
2012-08-14MAINT-1413,MAINT-1425,MAINT-1426: BUGFIX Correcting a problem where the ↵Todd Stinson
build/edit floater was being dirtied at the wrong time.
2012-08-14PATH-842: Another tweak to get the llSetTargetOmega functionality working in ↵Todd Stinson
the viewer.
2012-08-14PATH-856: Adding a new notification to indicate when the user will be ↵Todd Stinson
toggling the phantom flag of a linkset through the Pathfinding Linksets floater.
2012-08-14PATH-854: Adding support to display whether linksets are scripted or not in ↵Todd Stinson
the pathfinding linksets floater.
2012-08-14PATH-849: Group objects were losing their [group] identifier following the ↵Todd Stinson
last commit. This should fix that issue.
2012-08-14merge back beta fixesOz Linden
2012-08-14PATH-849: Refactoring the behavior after loading the owner name of a ↵Todd Stinson
pathfinding object into the avatar name cache so that each object can simply update its respective row in the scroll list rather than rebuilding from scratch after all names are loaded.
2012-08-14merge changes for DRTVWR-193Oz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-14merge changes for DRTVWR-195Oz Linden
2012-08-14merge changes for DRTVWR-191Oz Linden
2012-08-14correct merge errorOz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-14merge changes for DRTVWR-192Oz Linden
2012-08-13PATH-852: BUGFIX Adding the custom pathfinding cursors to the mac and linux ↵Todd Stinson
builds as apparently they never worked there.
2012-08-13PATH-849: CRASHFIX This should fix the crash caused by ↵Todd Stinson
LLPathfindingObject::handleAvatarNameFetch being called after the corresponding LLPathfindingObject has been deleted.