summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2014-02-25don't use the simulator channel in the keywords cache file nameOz Linden
2014-02-25keywords_lsl_default.xml updates from the simulator treeOz Linden
2014-02-25merge changes for 3.7.2-releaseOz Linden
2014-02-25merge latest changes from Ima with 3.6.14-releaseOz Linden
2014-02-25merge viewer-release to sunshine-externalBrad Payne (Vir Linden)
2014-02-24merge with releaseRichard Linden
2014-02-24Pulled from release.obscurestar
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-24MAINT-2588 FIXED User cannot delete items from content of other object, using...akl
2014-02-25Merge downstream codesimon
2014-02-24mergeBrad Payne (Vir Linden)
2014-02-24STORM-2015 Region restart sound alerts from all users on a STORM-1980 enabled...Jonathan Yap
2014-02-22Simple variable cleanup.Ricky Curtice
2014-02-21changed variable names and errors to more accurately reflect the operation be...JJ Linden
2014-02-21Merge downstream codesimon
2014-02-21Added Friends tab to Facebook floater for ACME-1325Cho
2014-02-20[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the c...Baker Linden
2014-02-20Fix build problemmaksymsproductengine
2014-02-20Fix build problemmaksymsproductengine
2014-02-19duplicated the workaround added for darwin codesigning onto the windos codesi...JJ Linden
2014-02-19Merge with releaseRichard Linden
2014-02-18STORM-1920: Documented the meaning of some of the variables involved, built s...Ricky Curtice
2014-02-18STORM-1920: Math cleanup from Richard Linden.Ricky Curtice
2014-02-14Merge. Refresh from viewer-release after 3.7.1 release.Monty Brandenberg
2014-02-14Pull merge from viewer-releaseMerov Linden
2014-02-14Pull merge from lindenlab/viewer-acmeMerov Linden
2014-02-14Reduced intensity of light leak on Lens Flare filter for ACME-1277Cho
2014-02-14increment viewer version to 3.7.2Oz Linden
2014-02-14ACME-1277 : Delete debug printouts spamming the logMerov Linden
2014-02-14OPEN-203 dummy commit to satisfy mercurialDrake Arconis
2014-02-13Pull merge from lindenlab/viewer-acmeMerov Linden
2014-02-13ACME-1277 : Final set of filters, added a SnapshotFiltersEnabled debug settingMerov Linden
2014-02-13Updated test filtersCho
2014-02-12add two debug settings: "SceneLoadLowMemoryBound" and "SceneLoadHighMemoryBound"Xiaohong Bao
2014-02-12Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2014-02-12reduce peak memory usage to fix SH-4574: Interesting: viewer crash in LLJoint...Xiaohong Bao
2014-02-12Pull merge from lindenlab/viewer-acmeMerov Linden
2014-02-12Pull mergeMerov Linden
2014-02-12ACME-1277 : Add new example filter scriptsMerov Linden
2014-02-12Changed Flickr link text for ACME-1320Cho
2014-02-12merge with releaseRichard Linden
2014-02-11mergeBrad Payne (Vir Linden)
2014-02-11Merge. Refresh from viewer-release after 3.7.0 releaseMonty Brandenberg
2014-02-11merge up to 3.7.0-release and get unit test fixesOz Linden
2014-02-10Pull merge ACME-1317 emergency fixMerov Linden
2014-02-10Merge pull from lindenlab/viewer-releaseMerov Linden
2014-02-10STORM-1915 Fix unit testsJonathan Yap
2014-02-11mergeCho