summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-23MAINT-8675: update expired certs in integration testOz Linden
2018-05-23SL-821: Try again to add -rpath to Mac executable for BugSplat.Nat Goodspeed
2018-05-23Removed mSavedEnvironment so the Mac build will be happy.Rider Linden
2018-05-23MAINT-8344 Day Cycle Editor (playing)andreykproductengine
2018-05-23SL-824: Update to bugsplat build 515662Nat Goodspeed
2018-05-23Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2018-05-23SL-824: Update to bugsplat build 515657Nat Goodspeed
2018-05-23MAINT-8619 Disable local textures for selection in Group profilemaxim_productengine
2018-05-23SL-804, SL-821, SL-824: Merge Mac changes with Windows changesNat Goodspeed
2018-05-23SL-824: Update to bugsplat build 515654Nat Goodspeed
2018-05-23MergeGraham Linden graham@lindenlab.com
2018-05-22Enable save/load/import for day edit.Rider Linden
2018-05-22Remove some obsolete sky funcs.Graham Linden graham@lindenlab.com
Remove Matrix3/4 funcs using LLQuat 4-float init incorrectly (they are redundant to angle/axis versions anyway). Fix up tests referring to removed funcs above.
2018-05-22Merge 5.1.5Graham Linden graham@lindenlab.com
2018-05-22MergeRider Linden
2018-05-22Merge PRRider Linden
2018-05-22Manual blender for use in day editing dialog.Rider Linden
2018-05-22MAINT-8344 Day Cycle Editor (part 4, finalization)andreykproductengine
2018-05-22SL-821: Add macOS rpath to Mac viewer executable for BugsplatMac.Nat Goodspeed
The BugsplatMac framework is stamped with @rpath/BugsplatMac.framework/etc., so that's the dependency stamped into our viewer executable. To support that lookup, direct CMake to add an appropriate RPATH to the executable.
2018-05-22SL-821: Copy BugsplatMac.framework into target application bundle.Nat Goodspeed
2018-05-22Merged in ruslantproductengine/viewer-neko-4cr-4 (pull request #607)Ruslan Teliuk
MAINT-8670 Crash in: LLFace::getGeometryVolume() Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com> Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com> Approved-by: Simon Linden <simon@lindenlab.com>
2018-05-22MAINT-8670 Crash in: LLFace::getGeometryVolume()ruslantproductengine
Guarded.
2018-05-22MAINT-2338 Unit testsAndrey Kleshchev
2018-05-22MAINT-8635 Don't allow using 'close all windows' if modal toast is openmaxim_productengine
2018-05-22MAINT-8553 FIXED link is not copied from original folder in some casesmaxim_productengine
2018-05-21SL-804, SL-824: Update to bugsplat build 515598Nat Goodspeed
2018-05-21SL-821: Need -fcxx-modules for C++ module support, vs. classic C.Nat Goodspeed
2018-05-21Make rendering of sun / moon work with both in the sky (test visibility ↵Graham Linden graham@lindenlab.com
independently).
2018-05-21SL-821: Add -fmodules to llappdelegate-objc.mm compile switches.Nat Goodspeed
The BugsplatMac package is built as a module requiring @import. Using @import requires Objective-C++ module support, which requires the -fmodules switch.
2018-05-21SL-821: Use @import, not #import.Nat Goodspeed
2018-05-21SL-821: Merge changes for Windows platformNat Goodspeed
2018-05-21SL-821: Introduce macOS BugSplat initialization.Nat Goodspeed
2018-05-21SL-821: Reorder CMakeLists.txt includes to resolve interdependencies.Nat Goodspeed
2018-05-21Fix broken integration and unit tests.Graham Linden graham@lindenlab.com
Update KDU stubs in integration test. Work around MAINT-8675 stale cert in llsechandler_basic for now. Update stubs for LLTrans::getString in handful of integration tests.
2018-05-30Merged in oz_linden/maint-8675AndreyL ProductEngine
2018-05-21SL-857 Remove "Create Auction" functionality from viewermaxim_productengine
2018-05-18Remove no longer used var hosing OSX build.Graham Linden graham@lindenlab.com
2018-05-18Remove MSVC debug pragmas and comment out code to dump example grids.xml ↵Graham Linden graham@lindenlab.com
file w/ hard-coded grids.
2018-05-18Make nighttime elev constant _SIN, since it uses a sin value.Graham Linden graham@lindenlab.com
Put that constant in sky settings and eliminate dups. Fix up logic around when to use heavenly bodies (fix broken moon in basic sky). Remove unnecessary clip to horizon. Put in temp code to ena/dis sun/moon based on LLEnvironment::getIsDaytime().
2018-05-18MergeRider Linden
2018-05-18Day cycle editor changes for loading settings. (Not complete)Rider Linden
2018-05-18MAINT-8344 Day Cycle Editor (part 3)andreykproductengine
2018-05-18MAINT-8669 Add callback to show appropriate friendship menu optionmaxim_productengine
2018-05-18Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-05-18Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2018-05-18MAINT-7626 EOF fixAndreyL ProductEngine
2018-05-18MergeAndreyL ProductEngine
2018-05-17increment viewer version to 5.1.5Nat Goodspeed
2018-05-17Added tag 5.1.4-release for changeset 7b6b020fd5adNat Goodspeed
2018-05-18MergeGraham Linden graham@lindenlab.com