summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
AgeCommit message (Collapse)Author
2013-05-21mergeBrad Payne (Vir Linden)
2013-05-20Merge with viewer-releasedolphin
2013-05-20WIP check in, testing GetMetadolphin
2013-05-16fix for SH-4080: interesting: random crash on MacXiaohong Bao
2013-05-13Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingXiaohong Bao
2013-05-09Merge downstream code and viewer-betasimon
2013-05-05Spring cleaning: removed unused .cpp and.h files, and cleaned up header ↵Richard Linden
dependencies
2013-05-02ACME-306 : Pull merge from viewer-chuiMerov Linden
2013-05-01performance optimization: only scan 32 objects per frame looking for invisibles.Xiaohong Bao
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25Enhance "duplicate seed caps" log message ... this needs more investigation.simon
Reviewed by Kelly
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-18SH-4128 WIP - use the AISv3 inventory cap when available for cof link ↵Brad Payne (Vir Linden)
deletion, hook in to callback mechanism so all link operations should be done before outfit is worn.
2013-04-17for SH-4105: interesting: new viewer does not handle orphaned child prims in ↵Xiaohong Bao
ObjectUpdateCompressed messages
2013-04-13switched to use FacebookConnect and FacebookRedirect capabilitiesCho
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11for SH-4095: add an option to turn off new interest list codeXiaohong Bao
2013-04-04Merge with viewer-developmentdolphin
2013-04-02Renamed logCapabilites static function to log_capabilities in ↵Logan Dethrow
llviewerregion.cpp to better match coding standard.
2013-04-01If we get more caps from a subsequent grant for a region, go ahead and use ↵Logan Dethrow
them. This is a hack that should be safe to remove after SH-3895 is fixed everywhere on the sim side.
2013-04-01trivial: convert to unix line endings.Xiaohong Bao
2013-03-29save cache file when first login to a region.Xiaohong Bao
2013-03-29delay removing invalid objects from cache in case region is logged out too soon.Xiaohong Bao
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. ↵simon
Reviewed by Kelly
2013-03-28Made a bug that was masking the warning about mismatched caps coming from a ↵Logan Dethrow
region. They could never match because certain capabilities are explicitly not stored when we receive them. * Made mSecondCapabilitiesTracker set capabilities in a way that more closely matches mCapabilities so that they will match up when we get a second cap grant from a region if the caps that were sent are actually the same. * Added more logging around setting a region's seed capability. * Also added a static function in llviewerregion to dump out a CapabilityMap based on the logActiveCapabilities method. Defined the old method in terms of the new static free function.
2013-03-22Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingRichard Linden
2013-03-22Automated merge with ↵Richard Linden
bundle:d:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.sp0eps\ssh__richard@hg.lindenlab.com_richard_viewer-interesting-metrics_5o81ck.hg
2013-03-22merge with viewer-releaseRichard Linden
2013-03-20for SH-3918: Viewer should respond to cache probes in order received (don't ↵Xiaohong Bao
sort response)
2013-03-13for SH-3913: the viewer should notify the region at connect time if it does ↵Xiaohong Bao
not have a cache file
2013-03-13revert changes for SH-3653: Can we repurpose ↵Xiaohong Bao
ObjectUpdateCached:ObjectData:UpdateFlags field to carry spatial+size data?
2013-03-13Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile ↵Don Kjer
failures
2013-03-13Large changes to the LLCurl::Responder API, as well as pulling in some ↵Don Kjer
changes to common libraries from the server codebase: * Additional error checking in http handlers. * Uniform log spam for http errors. * Switch to using constants for http heads and status codes. * Fixed bugs in incorrectly checking if parsing LLSD xml resulted in an error. * Reduced spam regarding LLSD parsing errors in the default completedRaw http handler. It should not longer be necessary to short-circuit completedRaw to avoid spam. * Ported over a few bug fixes from the server code. * Switch mode http status codes to use S32 instead of U32. * Ported LLSD::asStringRef from server code; avoids copying strings all over the place. * Ported server change to LLSD::asBinary; this always returns a reference now instead of copying the entire binary blob. * Ported server pretty notation format (and pretty binary format) to llsd serialization. * The new LLCurl::Responder API no longer has two error handlers to choose from. Overriding the following methods have been deprecated: ** error - use httpFailure ** errorWithContent - use httpFailure ** result - use httpSuccess ** completed - use httpCompleted ** completedHeader - no longer necessary; call getResponseHeaders() from a completion method to obtain these headers. * In order to 'catch' a completed http request, override one of these methods: ** httpSuccess - Called for any 2xx status code. ** httpFailure - Called for any non-2xx status code. ** httpComplete - Called for all status codes. Default implementation is to call either httpSuccess or httpFailure. * It is recommended to keep these methods protected/private in order to avoid triggering of these methods without using a 'push' method (see below). * Uniform error handling should followed whenever possible by calling a variant of this during httpFailure: ** llwarns << dumpResponse() << llendl; * Be sure to include LOG_CLASS(your_class_name) in your class in order for the log entry to give more context. * In order to 'push' a result into the responder, you should no longer call error, errorWithContent, result, or completed. * Nor should you directly call httpSuccess/Failure/Completed (unless passing a message up to a parent class). * Instead, you can set the internal content of a responder and trigger a corresponding method using the following methods: ** successResult - Sets results and calls httpSuccess ** failureResult - Sets results and calls httpFailure ** completedResult - Sets results and calls httpCompleted * To obtain information about a the response from a reponder method, use the following getters: ** getStatus - HTTP status code ** getReason - Reason string ** getContent - Content (Parsed body LLSD) ** getResponseHeaders - Response Headers (LLSD map) ** getHTTPMethod - HTTP method of the request ** getURL - URL of the request * It is still possible to override completeRaw if you want to manipulate data directly out of LLPumpIO. * See indra/llmessage/llcurl.h for more information.
2013-03-11for SH-3979: interesting: can not edit objects with new object cache codeXiaohong Bao
2013-03-11mergeprep
2013-03-07for SH-3937: interesting: implement the new cache probe logicXiaohong Bao
2013-03-05Fixing issues with not detecting when LLSD XML parsing fails. Changing most ↵Don Kjer
http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-03-04trivial: convert to unix line endings.Xiaohong Bao
2013-02-28for SH-3824: interesting: Ensure viewer can handle object updates from ↵Xiaohong Bao
entire region gracefully
2013-02-28WIP: Removed caching of responder id. Code to dump the new and old seed caps ↵prep
when we receive multiple seedcaps for a region.
2013-02-28Bug fix# we don't want to be incrementing the responderid in the base responderprep
2013-02-28Renamed seedcap tracker classprep
2013-02-28mergeprep
2013-02-28SH-3895. Added code to recognize if the second incoming regions seed caps ↵prep
differ in size from the initial region caps. Also avoid starting a inventory fetch responder if the requisite cap is missing"
2013-02-27Automated merge with https://bitbucket.org/lindenlab/sunshine-internalRichard Linden
2013-02-13Updated experience cache to latest web service apidolphin
Added new CAP request for experiences the avatar can sign
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-01-24more for SH-3653: Can we repurpose ObjectUpdateCached:ObjectData:UpdateFlags ↵Xiaohong Bao
field to carry spatial+size data?
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.