summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
AgeCommit message (Expand)Author
2013-11-18merge changes for STORM-1831Oz Linden
2013-11-07STORM-1831 Adding "LSLSyntax" to list of capabilities the region keeps track of.Ima Mechanique
2013-09-20Fix AvatarRenderInfo cap broken in merge, add a new diagnostic log messagesimon
2013-10-23Merge latest viewer-release with FBCsimon
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-09-19Pull from lindenlab/viewer-releaseMerov Linden
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
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-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
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. R...simon
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
2013-01-24merging in viewer-beta.Nyx Linden
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 a...prep
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 change...Logan Dethrow
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 out-of-ord...Dave Parks