summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Collapse)Author
2010-04-21Automated mergeRoxie Linden
2010-04-21merge from viewer-trunkTofu 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-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-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
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-01Automated MergeRoxie Linden
2010-04-01another hairy merge from viewer-trunkTofu Linden
2010-03-31mergeBrad Payne (Vir Linden)
2010-03-31asset request logging for DEV-47362 investigation.Brad Payne (Vir Linden)
2010-03-31EXT-5581 : Centralize is_asset_fetch/knowlable into asset dictionaryLoren Shih
Took out some ugly case statements and stuck those functions into the asset dictionary instead. This makes the code a lot more centralized/extensible since if we ever add assets, it'll be clear that their fetch/knowable fields need to be added (versus that logic being in some obscure case statement).
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-29Automated mergeRoxie Linden
2010-03-29EXT-3075 : Remove swear words from comments across viewerLoren Shih
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2010-03-24viewer2 mergeTofu Linden
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-22Fixed bug EXT-6446 (Profile Real World description gets messed up if out of ↵Vadim Savchuk
the old characters' number limit). Submitting on behalf of Dmitry Zaporozhan. Reviewed by me and Richard: https://codereview.productengine.com/secondlife/r/67/ --HG-- branch : product-engine
2010-03-20mergeDave Parks
2010-03-05fixed EXT-5910 “Offers logging”,Alexei Arabadji
fixed IM message counter when received interactive notification(offer); corrected logging to file of offer notification; enabled logging for FRIENDSHIP_ACCEPTED notification; --HG-- branch : product-engine
2010-03-02cleanup from reviewDave Parks
2010-03-02Curl tweaks to get rid of various types of timeouts.Dave Parks
- Scrub host names from capability ips (requires disabling SSL host name verification) - Reset connections that have received a timeout (avoids cascading timeouts from reusing a cached bad connection)
2010-02-24Added lower level pool to curl easy handles to speed up HTTP requests (from ↵Dave Parks
40 ms per request to < 1 ms per request).
2010-02-17Post-review cleanup.Dave Parks
2010-02-17mergeDave Parks
2010-02-17Switched program database on windows to edit and continue for non-release ↵Dave Parks
builds. Adding a debug watch to LLCurlRequest to avoid invalidating iterator on processing posts. Mesh bulk uploading rewrite work in progress. 404 icons for mesh assets.
2010-02-13merge from viewer2. this fucks up davep's optimizations, so I'll backout ↵Tofu Linden
their backout next to restore them. I hope. Sheesh.
2010-02-12Changing viewer unit test licenses to viewergplMark Palange (Mani)
2010-02-11Multi-threaded asset uploading with proper ordering first draft.Dave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 02:34:44 +0000