summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
AgeCommit message (Collapse)Author
2014-02-25Merge viewer-releasesimon
2013-12-11removing of dos line endingmaksymsproductengine
2013-12-10Re-fix merge issue that removed "AvatarRenderInfo" cap usagesimon
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-12Merge. Refresh from viewer-release after 3.6.10 releaseMonty Brandenberg
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-10-04Merge. Pull in viewer-release after 3.6.7 release.Monty Brandenberg
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-09-20Fix AvatarRenderInfo cap broken in merge, add a new diagnostic log messagesimon
2013-09-19Pull from lindenlab/viewer-releaseMerov Linden
2013-09-19Merge. Pull in viewer-release after materials viewer release.Monty Brandenberg
2013-10-23Merge latest viewer-release with FBCsimon
2013-09-25Merge recent viewer-bear fixes that missed the boatGraham Linden
2013-09-19Merge downstream codesimon_linden
2013-07-25MAINT-2715 FIX Capabilities request handling not working properly if request ↵PavelK ProductEngine
gets lost
2013-07-18Merge. Refresh from viewer-release.Monty Brandenberg
2013-07-02fix bug reading RenderMaterialsCapability, improve logging for NORSPEC-206Oz Linden
2013-06-28SH-4257 Prepare for new 'GetMesh2' capability.Monty Brandenberg
Needed to move the cap from response to region instance.
2013-06-28move reading of the sim features to LLViewerRegion for consistency, a couple ↵Oz Linden
of minor cleanups
2013-06-28NORSPEC-206: read RenderMaterialsCapability throttle rate per second from ↵Oz Linden
simulator
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-06-19Pull merge from lindenlab/viewer-releaseMerov Linden
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-05-02ACME-306 : Pull merge from viewer-chuiMerov Linden
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-13switched to use FacebookConnect and FacebookRedirect capabilitiesCho
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