summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
AgeCommit message (Collapse)Author
2013-07-25MAINT-2715 FIX Capabilities request handling not working properly if request ↵PavelK ProductEngine
gets lost
2013-06-27Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if availableOz Linden
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-05-09Merge downstream code and viewer-betasimon
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-11Merge in downstream code (chui fixes, materials)simon
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-11mergeprep
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-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-12merge up to 3.4.5-releaseOz Linden
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.
2012-12-13Merged SH-3339 work with sunshine-internal. Still a WIP.Logan Dethrow
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-15Merge lindenlab/sunshine-internal -> log/sunshine-internalLogan Dethrow
2012-11-15WIP Working on adding http request to increment the COF version when a ↵Logan Dethrow
change is made to an item in an agent's current outfit folder. SH-3339
2012-11-14SH-3541 WIP - fixed one cause of local textures failing to loadBrad Payne (Vir Linden)
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-01misc error detection, debug coloration for avatar meshesBrad Payne (Vir Linden)
2012-10-25MergeKelly Washington
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-11Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-10pull back 3.4.1-beta6 fixesOz Linden
2012-10-10Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179.William Todd Stinson
2012-10-03Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix ↵Dave Parks
out-of-order deletion of LLTextureFetch on shutdown
2012-09-27audited uses of centralBakeVersion vs. isUsingServerBakesBrad Payne (Vir Linden)
2012-09-20reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.Dave Parks
2012-09-10Fixed line endings from DOS to UNIX.Baker Linden
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-29First pass at throwing together a test panel for the material capability ↵William Todd Stinson
service.
2012-08-24Automated merge with http://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-08-23Start of getting WSGI service on viewerChris Baker
2012-08-22Removed UseServerTextureBaking setting, now key off region protocol bitsBrad Payne (Vir Linden)
2012-08-22mergeBrad Payne (Vir Linden)
2012-08-17Expanding region flags to 64 bits. Adding region protocol flagsDon Kjer
2012-08-14Automated merge with https://bitbucket.org/VirLinden/sunshineNyx (Neal Orman)
2012-08-14SH-3310 WIP setting up architecture for switching texture baking on ↵Nyx (Neal Orman)
per-region basis Set up an architecture to minimize the use of the baked texture debug setting. Instead concentrating on setting a per-region flag at the region handshake point. This should be processed once the new regions are using the updated handshake. The debug setting is being used in this one location as a placeholder. Builds, but not fully tested/commented yet, passing this work off to Vir.
2012-07-31merge up to latest viewer-developmentOz Linden
2012-07-30mergeBrad Payne (Vir Linden)