summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Collapse)Author
2010-06-07Merge with render-pipelineDave Parks
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-22EOL added.Palmer
2010-07-22EXT-7145 - Handle http redirects in viewer properly. Didn't work before.Palmer
Reviewed by Bao and Babbage
2010-07-26(hairy) merge from viewer-releaseTofu Linden
2010-06-28EXT-7498 WIP Snapshot SharingAimee Linden
Reviewed by Tofu.
2010-06-15Merged from viewer-releaseDessie Linden
2010-06-14Merge.brad kittenbrink
2010-06-14FIX EXT-7857 - c-ares library initialization was skipping a new step.brad kittenbrink
2010-06-14EXT-7855 FIXED Memory leak in llmessage/llhttpclient.cppLynx Linden
We now free the fileBuffer when we're done in VFileInjector::process_impl()
2010-06-14Merged from viewer-releaseDessie Linden
2010-06-11Upgraded windows libcurl to 7.20.1 and c-ares to 1.7.1 for consistency with ↵brad kittenbrink
mac/linux and potentially improve EXT-7032 behavior.
2010-06-07merge from viewer-publicTofu Linden
2010-06-07merge backoutTofu Linden
2010-06-07EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.Tofu Linden
Backed out changeset e6feef9704cf to re-introduce Bao's fix
2010-05-28merge from viewer-publicTofu Linden
2010-05-24Static VFS cache tracingBrad Payne (Vir Linden)
2010-05-24merge from viewer-publicTofu Linden
2010-05-24Backed out changeset 57e00f7d4d4fTofu Linden
(was: EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.) This was causing osx/linux build failure.
2010-05-22merge from viewer-publicTofu Linden
2010-05-18EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.Xiaohong Bao
2010-05-12merge from viewer-publicTofu Linden
2010-05-10Automated MergeRoxie Linden
2010-05-05merge from viewer-publicTofu Linden
2010-05-05merge from viewer-publicTofu Linden
2010-05-04DEV-49633 WIP LLHTTPClient calls responders with headers _before_ bodyJames Cook
2010-04-21Automated mergeRoxie Linden
2010-04-21merge from viewer-trunkTofu Linden
2010-04-21merge from viewer-trunkTofu Linden
2010-04-20CID-462Tofu Linden
Checker: DEADCODE Function: LLAssetStorage::findInStaticVFSAndInvokeCallback(const LLUUID &, LLAssetType::EType, void (*)(LLVFS *, const LLUUID &, LLAssetType::EType, void *, int, int), void *) File: /indra/llmessage/llassetstorage.cpp
2010-04-20merge from viewer-trunkTofu Linden
2010-04-20slightly hairy merge from viewer-trunkTofu Linden
2010-04-19For EXT-6809 - fixes suggested by Nyx code reviewBrad Payne (Vir Linden)
2010-04-19mergeBrad Payne (Vir Linden)
2010-04-19For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-16For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-16For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-19automated merge with trunkRoxie Linden
2010-04-14slightly hairy merge from viewer-trunkTofu Linden
2010-04-13Fixed bug EXT-5415 (Edit floater and object profile show group as ↵Vadim Savchuk
"loading..." when set to "none"). Made LLCacheName getGroupName() and getName() methods return TRUE if the given group/avatar name is NULL, so that LLNameBox doesn't display "Loading..." indefinitely. There's nothing to wait for in case of NULL id: the name cache returns a predefined name that won't change (i.e. it's the final result). Reviewed by Mike: https://codereview.productengine.com/secondlife/r/223/ --HG-- branch : product-engine
2010-04-15merge from viewer-trunkTofu Linden
2010-04-07Automated mergeRoxie Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07merge from viewer-trunkTofu Linden
2010-04-07mergeTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden
2010-04-06some fixing from the viewer-trunk merge.Tofu Linden