diff --git a/doc/contributions.txt b/doc/contributions.txt index fb6340f026d7803476cc21fc9791a93d1b025d8e..7bbbf6430a52d84a7c080bc372caf750f71742e3 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1462,7 +1462,6 @@ Tonya Souther BUG-3875 BUG-3968 OPEN-345 - SL-13082 Torben Trautman TouchaHoney Perhaps TraductoresAnonimos Alter diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a17bf088cd7d392511d8b4168e1c4f2f60d87a62..0d204fd716de181a157db455ec2d46c6add7c405 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1944,10 +1944,6 @@ elseif (DARWIN) set_target_properties(${VIEWER_BINARY_NAME} PROPERTIES LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -dead_strip -Xlinker -map -Xlinker ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}.MAP" - # Force the SDK version in the linked executable to be 10.12. This will fool - # macOS into using the pre-Mojave display system, avoiding the blurry display that - # otherwise occurs when upscaling the viewer to Retina resolution levels. - LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -platform_version -Xlinker macos -Xlinker ${CMAKE_OSX_DEPLOYMENT_TARGET} -Xlinker 10.12" ) else (WINDOWS) # Linux diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 4f09495f83a5db4d077e311e647ffb72b258ae6b..cfe9d991c5a90c803acca5ce64ea101d47a2c480 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -79,7 +79,5 @@ <string>${MACOSX_BUNDLE_NSPRINCIPAL_CLASS}</string> <key>NSMainNibFile</key> <string>${MACOSX_BUNDLE_NSMAIN_NIB_FILE}</string> - <key>NSHighResolutionCapable</key> - <true/> </dict> </plist>