summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-26Automated merge with ssh://bitbucket.org/lindenlab/viewer-bugsplatNat Goodspeed
2018-05-26SL-823: Fix typo in code that sets up BugSplat.Nat Goodspeed
2018-05-25SL-823: Fix minor compile errors in code to read build_data.json.Nat Goodspeed
2018-05-25MAINT-8693 Fixed crashes during login if you wear a BOM tattoo layerAndrey Kleshchev
2018-05-25SL-821: export BUGSPLAT_DB when loaded so child processes can detect.Nat Goodspeed
Produce CMake message when BugSplat is engaged so we can detect in build log. Don't try to copy BugSplat DLLs when NOT engaged.
2018-05-25SL-821, SL-826: Use BUGSPLAT_DB from environment on Windows and Mac.Nat Goodspeed
On TeamCity, set BUGSPLAT_DB from build-secrets. Use the presence of $BUGSPLAT_DB, rather than a new CMake BUGSPLAT option, to control whether CMake searches for BugSplat -- and passes LL_BUGSPLAT into C++. When BUGSPLAT_DB is present, make viewer_manifest.py set "BugSplat DB" in build_data.json, and "BugsplatServerURL" in Mac Info.plist. Make llappviewerwin32.cpp read "BugSplat DB" from build_data.json. Add placeholders for Mac hooks to suppress BugSplat prompt and send SecondLife.log.
2018-05-25MAINT-8459 Save favorite places and landmarks to Location Bar history listmaxim_productengine
2018-05-25MAINT-8674 Fixed logsandreykproductengine
2018-05-25MAINT-8674 Clean up already requested ids.Andrey Kleshchev
2018-05-25Merged in andreyl_productengine/viewer-neko-marchcat (pull request #613)Andrey Lihatskiy
MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
2018-05-25MAINT-8694 FIXED Typo in loggingmaxim_productengine
2018-05-24switch track based on altitudes sent from region.Rider Linden
2018-05-24MergeRider Linden
2018-05-24merge Nat's fix for llcorehttp testOz Linden
2018-05-24Merged in nat_linden/maint-maint-8675AndreyL ProductEngine
2018-05-24Enable sky changes with altitude.Rider Linden
2018-05-24Automated merge with ssh://bitbucket.org/nat_linden/maint-maint-8675Nat Goodspeed
2018-05-24MAINT-8675: In Darwin-specific CMake, use cp, not cmake -E copy.Nat Goodspeed
cmake -E copy does only one file at a time, and older CMake versions don't handle wildcards. But cmake -E copy is specifically for portability. When the copy operation itself is Darwin-only, we can count on having 'cp' available.
2018-05-24govern running tests with the LL_TESTS variable, default ONOz Linden
2018-05-24Merged in oz_linden/maint-8675AndreyL ProductEngine
2018-05-24MAINT-8634 Hide texture UUIDs for non-godsmaxim_productengine
2018-05-24SL-821: Force the Mac -rpath linker switch using LINK_FLAGS propertyNat Goodspeed
instead of the INSTALL_RPATH CMake property, which _should_ have worked.
2018-05-24MAINT-8687 Add a hotkey for Advanced > Set UI Size to Defaultmaxim_productengine
2018-05-23Automated merge with ssh://bitbucket.org/oz_linden/maint-8675Nat Goodspeed
2018-05-23fix tests broken by argument added to LLTrans::getStringOz Linden
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