summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
AgeCommit message (Expand)Author
2013-12-05mergeBrad Payne (Vir Linden)
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-10-29Merge viewer-release => sunshine-internalDon Kjer
2013-10-16mergeBrad Payne (Vir Linden)
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-09-24SH-3455 WIP - removed some handling for appearance version < 1Brad Payne (Vir Linden)
2013-09-20Fix AvatarRenderInfo cap broken in merge, add a new diagnostic log messagesimon
2013-09-19Pull from lindenlab/viewer-releaseMerov Linden
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-08-08Moved commented out capabilities debugging code into ifdef'd block and added ...Logan Dethrow
2013-07-25MAINT-2715 FIX Capabilities request handling not working properly if request ...PavelK ProductEngine
2013-07-11Adding support for COPY methods to httpclient. Implementing viewer-side use ...Don Kjer
2013-07-02fix bug reading RenderMaterialsCapability, improve logging for NORSPEC-206Oz Linden
2013-06-28move reading of the sim features to LLViewerRegion for consistency, a couple ...Oz Linden
2013-06-28NORSPEC-206: read RenderMaterialsCapability throttle rate per second from sim...Oz Linden
2013-06-27Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
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-06-18merge with viewer-releaseNyx Linden
2013-06-17SH-4274 FIX Adding RegionHandshakeReply flags for SSANyx Linden
2013-05-31SH-3635 WIPBrad Payne (Vir Linden)
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-21mergeBrad Payne (Vir 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
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-18SH-4128 WIP - use the AISv3 inventory cap when available for cof link deletio...Brad Payne (Vir Linden)
2013-04-13switched to use FacebookConnect and FacebookRedirect capabilitiesCho
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-02Renamed logCapabilites static function to log_capabilities in llviewerregion....Logan Dethrow
2013-04-01If we get more caps from a subsequent grant for a region, go ahead and use th...Logan Dethrow
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. R...simon
2013-03-28Made a bug that was masking the warning about mismatched caps coming from a r...Logan Dethrow
2013-03-13Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile f...Don Kjer
2013-03-13Large changes to the LLCurl::Responder API, as well as pulling in some change...Don Kjer
2013-03-11mergeprep
2013-03-05Fixing issues with not detecting when LLSD XML parsing fails. Changing most ...Don Kjer
2013-02-28WIP: Removed caching of responder id. Code to dump the new and old seed caps ...prep
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 dif...prep
2013-02-27Automated merge with https://bitbucket.org/lindenlab/sunshine-internalRichard Linden
2013-02-12merge up to 3.4.5-releaseOz Linden