summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-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-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-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-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-04-30MAINT-8610 Fixed GPU Benchmark appears to be broken - "Failed to allocate ↵AndreyL ProductEngine
buffer during benchmark"
2018-04-23MAINT-8574 Fixed Crash in LLVOVolume::markDead()AndreyL ProductEngine
+ null checks in LLVOVolume::setLightTextureID()
2018-04-23FIX INTL-282 minor translation issue, Germaneli
2018-04-19FIX INTL-282 minor translation issueeli
2018-04-12Automated merge with tip of viewer-release after Viewer Media Update releasecallum_linden
2018-04-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-04-12merge MAINT-8474 changesOz Linden
2018-04-12increment viewer version to 5.1.4Oz Linden
2018-04-06MAINT-8203 Restore legacy name lookupAndrey Kleshchev
2018-04-05FIX INTL-282 translations for Viewer Set50 (drtvwr-450 on repository ↵eli
viewer-lynx)
2018-04-04Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-04-04MAINT-8203 Temporary disable capability until 'friend request' server side fixandreykproductengine
2018-04-02MAINT-8203 LLIMInfo crash due to capabilityandreykproductengine
2018-03-31MAINT-8474: Xcode 9.3 insists that comparators use const operator().Nat Goodspeed
2018-03-27MAINT-8203 Group notices processingandreykproductengine
2018-03-24MAINT-8203 Fixing from_group processing in ReadOfflineMsgs capandreykproductengine
2018-03-23MAINT-8417 Don't run display or startup if window is not initializedandreykproductengine
2018-03-22MAINT-8403 Restore fail case for general upload snapshotmaxim_productengine
2018-03-21MAINT-8417 Fixed startup crash in doFrame() after failing to access vfs cacheandreykproductengine
2018-03-21MAINT-8403 FIXED "Snapshot" is stuck and not responding after sending ↵maxim_productengine
snapshot via e-mail
2018-03-20MAINT-8363 Additional sanity checksandreykproductengine
2018-03-20fixed line endingsmaxim_productengine
2018-03-20MAINT-8401 The ‘New’ icon does not disappear when navigating with the ↵maxim_productengine
keys in the ‘Received items’ panel
2018-03-16MAINT-8372 Fixed doubled error messagesandreykproductengine
2018-03-16MAINT-8399 fixed unnessesary spam and made message more informativeandreykproductengine
2018-03-16MAINT-8343 FIXED [MAC] Viewer Media Browser doubles entered Cyrillic capital ↵maxim_productengine
letters.
2018-03-15Pull in latest version of Dullahan (1.1.1072) and tweak media plugin code to ↵callum_linden
match change in API
2018-03-14MAINT-8383 FIXED Scrollbar does not decrease with decreasing number of ↵maxim_productengine
displayed media