summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2017-03-13Automated merge with tip of viewer-releaseCallum Prentice
2017-03-13increment viewer version to 5.0.4Oz Linden
2017-03-13SL-644 Add guard to mCount in LLRender.cppCallum Prentice
2017-03-12MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) ↵Callum Prentice
by default. (Update2: evidently the registry set call is needed on un.init() too
2017-03-11MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) ↵Callum Prentice
by default. (Update: call to select registry needs to be inside a function)
2017-03-11Update: (thanks Drake) MAINT-6998 [Project Alex Ivy] 64bit viewer installs ↵callum@lindenlab.com
to Program Files (x86) by default. Added option to engage 32 or 64 bit registry
2017-03-10MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) ↵Callum Prentice
by default.
2017-03-10Fix for MAINT-7047 No information about 32bit or 64bit version of 'Project ↵Callum Prentice
Alex Ivy' viewer in non-English locales
2017-03-09Second part of fix for SL-646 Fix 'LINK : warning LNK4075: ignoring ↵Callum Prentice
/INCREMENTAL due to '/LTCG' specification' in LibVLC, JPEGLIB etc.
2017-03-08Second Life SL-643 viewer_manifest.py still tried to copy the CEF file ↵callum@lindenlab.com
wow_helper.exe but it's no longer present
2017-03-08merge changes for MAINT-7156Oz Linden
2017-03-06Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-03-06increment viewer version to 5.0.3Oz Linden
2017-03-06Automated merge with tip of lindenlab/viewer64callum@lindenlab.com
2017-03-03Remove OSX headers added for testing purposes and also some unused varsCallum Prentice
2017-03-03First pass at osx/macos keyboard events - simple case like google homepage ↵callum@lindenlab.com
is working
2017-03-01Fix up slight change to Dullahan interface where we call out the platform ↵callum@lindenlab.com
for native keyboard injection to match OSX version
2017-03-01MAINT-7161 Crash in LLViewerInventoryItemandreykproductengine
2017-02-24First round of changes to make the macOS 64 build workcallum@lindenlab.com
2017-02-24MAINT-7156: do not use the server-supplied agent email when sending a ↵Oz Linden
postcard because it is obfuscated and not needed
2017-02-23Whoopps. Apologies for leaving Windows debug spam in code :(callum@lindenlab.com
2017-02-23Update media plugin CEF code to match new Dullahancallum@lindenlab.com
2017-02-22Use new version info from CEF plugin to display in About boxCallum Prentice
2017-02-22reenable support for copy/cut/paste to/from a web pageCallum Prentice
2017-02-22correct merge error in BuildVersion.cmakeOz Linden
2017-02-22use AUTOBUILD_BUILD_ID value for revision if available (requires autobuild ↵Oz Linden
1.1.4)
2017-02-21First round of changes to replace LLCEFLib with Dullahan. Mostly Windows ↵Callum Prentice
changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested
2017-02-17Automated merge with head of lindenlab/callum_viewer64callum@lindenlab.com
2017-02-15improve dependency declarations for packages-info and other settings filesOz Linden
2017-02-15MAINT-7130: suppress stdout from run_build_tests byOz Linden
converting to logging so that stdout from its command can be captured cleanly Make the default be to not print anything
2017-02-15convert run_build_tests to use argparse rather than optparseOz Linden
2017-02-13Automated merge with lindenlab/viewer64callum@lindenlab.com
2017-02-13DRTVWR-418: Fix syntax for previous test skip.Nat Goodspeed
2017-02-13Automated merge with lindenlab/viewer64callum@lindenlab.com
2017-02-13DRTVWR-418: Reluctantly skip llcorehttp 503-with-retry test on W64.Nat Goodspeed
2017-02-13Automated merge with head of callum_linden/viewer64-xcode8callum@lindenlab.com
2017-02-13Automated merge with head of callum_linden/viewer64-callumcallum@lindenlab.com
2017-02-13MAINT-6999 Cap attachment render weightandreykproductengine
2017-02-10Merged in lindenlab/viewer-bearAndreyL ProductEngine
2017-02-09MAINT-7095 Fixed Detached and reduced nearby chat floater does not maintain ↵andreykproductengine
its position through viewer restart.
2017-02-07MAINT-7112 FIXED URI namespace /completename is still affected by the ↵Mnikolenko Productengine
Usernames viewer setting.
2017-02-06MAINT-2001 Fixes colums misbeheavingandreykproductengine
2017-02-04DRTVWR-418: Merge from v-r makes llmath tests need Boost.Thread.Nat Goodspeed
2017-02-04DRTVWR-418: Finish cleaning up merge from viewer-release.Nat Goodspeed
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-02-03Change destination location of updated VLC files to correct onecallum@lindenlab.com
2017-02-03Automated merge with ssh://bitbucket.org/callum_linden/viewer64-xcode8Nat Goodspeed
2017-02-03DRTVWR-418: Remove most (all?) of the "stubs" from llurlentry_test.Nat Goodspeed
At some point the INTEGRATION_TEST_llurlentry build changed so that the library(ies) we attempted to stub out got linked in anyway, so that instead of simplifying the test, the stubs broke it with "duplicate symbol" errors. Commenting out the stubs permits the test program to succeed.
2017-02-03MAINT-6959: Use localized category namesAnsariel Hiller
2017-02-03Merged in lindenlab/viewer-bearAndreyL ProductEngine