summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-23Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2018-05-23MAINT-8619 Disable local textures for selection in Group profilemaxim_productengine
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-821: Need -fcxx-modules for C++ module support, vs. classic C.Nat Goodspeed
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-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-17SL-821: Use classic-C BugSplat callback and static dumb pointer.Nat Goodspeed
BugSplat has no business introducing a new C++ API based on classic-C function pointers without even a generic pass-through user data pointer!
2018-05-17MAINT-8649 FIXED CTRL+ALT+T does not make alpha masking textures visiblemaxim_productengine
2018-05-17MAINT-8479 When facing object we should ignore movement distance thresholdAndrey Kleshchev
2018-05-17SL-821: Convert wstrings to strings of __wchar_t for BugSplat API.Nat Goodspeed
2018-05-17SL-821: Move Windows BugSplat engagement from llcommon to newview.Nat Goodspeed
Use WSTRINGIZE(), LL_TO_WSTRING(), wstringize() to produce required wide strings. Use a lambda for callback that sends log file; use LLDir, if set, to find the log file. Introduce BUGSPLAT CMake variable to allow suppressing BugSplat. Make BUGSPLAT CMake variable set LL_BUGSPLAT for C++ compilations. Set viewer version macros on llappviewerwin32.cpp, llappviewerlinux.cpp and llappdelegate-objc.mm -- because BugSplat needs the viewer version data, and because the macOS BugSplat hook is engaged in an Objective-C++ function we override in the app delegate.
2018-05-17SL-821: Merge LL_TO_WSTRING(), WSTRINGIZE() changes.Nat Goodspeed
2018-05-17SL-821: Add WSTRINGIZE() and DEWSTRINGIZE() macros for wide strings.Nat Goodspeed
Streamline convenience overload stringize(std::wstring); make convenience overload wstringize(std::string) symmetrically convert from UTF-8 string. Also eliminate STRINGIZE() et al. dependency on Boost.Phoenix: use lambdas instead. Using lambdas instead of template expansion necessitates reordering some code in wrapllerrs.h.
2018-05-17SL-821: Add LL_TO_WSTRING() macro to llpreprocessor.h.Nat Goodspeed
Also use existing LL_TO_STRING() macro to stringize LL_VIEWER_CHANNEL in llversioninfo.cpp and its tests.
2018-05-14MAINT-8611 Prevent object media updates if media preference is disabledmaxim_productengine
2018-05-14Merged in ruslantproductengine/viewer-cougar-4cr-2 (pull request #10)Ruslan Teliuk
MAINT-8348 [LOVE ME RENDER] Edit Rotation Rings Occluded by Mesh Objects Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
2018-05-11SL-821: Use one self.path() call for everything under "llplugin".Nat Goodspeed
2018-05-11SL-821: Move BugSplat includes/libs from llcommon to newview.Nat Goodspeed
No C++ source in llcommon references any of the BugSplat code.
2018-05-10MAINT-8348 [LOVE ME RENDER] Edit Rotation Rings Occluded by Mesh Objectsruslantproductengine
FIXED
2018-05-09Merged in lindenlab/viewer-451AndreyL ProductEngine
2018-05-08MAINT-7626 Update logging and comments, sync remaining transfer changesandreykproductengine
2018-05-08MAINT-8586 XUI cleanupAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 08:45:25 +0000