summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2018-06-14Automated merge with file:///Users/nat/linden/viewer-no-vstoolNat Goodspeed
2018-06-14SL-821: Remove VSTool invocation to unbreak Windows TeamCity builds.Nat Goodspeed
2018-06-14SL-821: Continue changing macOS executable to match channel name.Nat Goodspeed
Set our CMake 'product' variable to VIEWER_CHANNEL. This probably has far- reaching implications, but it seems the expedient way to keep everything self- consistent. Use ${product} in the DARWIN VIEWER_EXE_GLOBS used for Breakpad symbol dumping instead of hardcoding 'Second Life'. The Breakpad symbol dumping stanza was enclosed in nested (but not indented) conditions. To these we add another condition: don't bother if we're using BugSplat. Unify all three into a single horrendous outermost expression. Fix the MACOSX_BUNDLE_INFO_STRING, and hence CFBundleGetInfoString, to VIEWER_CHANNEL as well. Our CMake MACOSX_BUNDLE_SHORT_VERSION_STRING was never used before -- we were erroneously using MACOSX_BUNDLE_LONG_VERSION_STRING in the Info-SecondLife.plist template even for CFBundleShortVersionString. Looks like a classic copy/paste error. Fix that; also use four-part version number instead of three-part. With those two changes, we shouldn't need to patch the top-level Info.plist in viewer_manifest.py any more. viewer_manifest.py still needs to move the viewer executable(s) to the embedded viewer app bundle, but it no longer needs to rename the real executable to the channel name since we've already dealt with that in CMake land. This lets us unify the code that picks the biggest of those executables in the first and second viewer_manifest.py runs.
2018-06-14SL-821: Defend macOS packaging against multiple viewer_manifest runsNat Goodspeed
2018-06-14SL-821: Rename macOS Second Life executable to match the channel name.Nat Goodspeed
This requires fixing CFBundleExecutable as well.
2018-06-14SL-920 Add new friendship caps to viewerandreykproductengine
2018-06-19Backed out changeset: 4ce8c663a9a0AndreyL ProductEngine
STORM-2122: UDP data bandwidth measuring is off by factor 8
2018-06-19mac build fixesmaxim_productengine
2018-06-18MAINT-8759 FIXED [Win] Choosing new cache location will cause disconnect if ↵maxim_productengine
you do not choose desired path in File picker quickly
2018-06-18MAINT-8751 Add a link to create an account to the viewer login screenmaxim_productengine
2018-06-16MAINT-8731 Fixed wrong valueandreykproductengine
2018-06-15Merged pull request #635Andrey Kleshchev
MAINT-8395 Rollback part of SL-711 to fix related crashes
2018-06-14Merged in lindenlab/viewer-bearAndreyL ProductEngine
2018-06-14MAINT-8750 Add transparency indicator for invisiprims.maxim_productengine
2018-06-14MAINT-8395 Rollback part of SL-711 to fix related crashesandreykproductengine
2018-06-14SL-821: Create macOS symbol-file archive while packaging.Nat Goodspeed
2018-06-13MAINT-8731 Click action to disable clicking objects, per-object in a linksetandreykproductengine
2018-06-06fix xcode buildAnchor Linden
2018-05-31merge changes for 5.1.5-releaseOz Linden
2018-05-31increment viewer version to 5.1.6Oz Linden
2018-05-30remove unused UNATTENDED cmake variable that generates warningsOz Linden
2018-05-30[MAINT-8693] - fix null checkAnchor Linden
2018-06-07MAINT-8689 Potential crash fixandreykproductengine
2018-06-02Merged in lindenlab/viewer-bearAndreyL ProductEngine
2018-06-01MAINT-8712 Crash on close in LLWindowWin32Andrey Kleshchev
2018-06-01MAINT-8714 Eliminate viewer duplicated ID nodesmaxim_productengine
2018-06-01merge from viewer-releaseandreykproductengine
2018-05-31MAINT-8702 FIXED Uploading any item results in opening previous Item Profile ↵maxim_productengine
instead of Inventory Floater
2018-05-31MAINT-8700 Remove obsolete code and update 'Save texture' file dialogmaxim_productengine
2018-05-30MAINT-8700 FIXED The File dialog disconnects the viewer if you do not choose ↵maxim_productengine
upload files within the first minute
2018-05-29MAINT-8586 Eliminate obsolete xui elementsandreykproductengine
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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 13:05:42 +0000