Rename OS X to macOS, mostly in comments

We only support 10.13+ now, and it's been called macOS since 10.12. References in code to older versions are unchanged.

5 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 00b59f9a4d..8f651a0294 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9022,7 +9022,7 @@
    <key>RenderHiDPI</key>
   <map>
     <key>Comment</key>
-    <string>Enable support for HiDPI displays, like Retina (MacOS X ONLY, requires restart)</string>
+    <string>Enable support for HiDPI displays, like Retina (macOS ONLY, requires restart)</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
diff --git a/indra/newview/llappviewermacosx-objc.mm b/indra/newview/llappviewermacosx-objc.mm
index 17301847e8..81ab4e0feb 100644
--- a/indra/newview/llappviewermacosx-objc.mm
+++ b/indra/newview/llappviewermacosx-objc.mm
@@ -25,7 +25,7 @@
  */ 
 
 #if !defined LL_DARWIN
-	#error "Use only with Mac OS X"
+	#error "Use only with macOS"
 #endif
 
 #import <Cocoa/Cocoa.h>
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index 8b313a321b..72e38cc1ea 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -27,7 +27,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #if !defined LL_DARWIN
-	#error "Use only with Mac OS X"
+	#error "Use only with macOS"
 #endif
 
 #define LL_CARBON_CRASH_HANDLER 1
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
index e35cb26ce1..dfa47e82b3 100644
--- a/indra/newview/llviewerjoystick.cpp
+++ b/indra/newview/llviewerjoystick.cpp
@@ -1414,7 +1414,7 @@ void LLViewerJoystick::setSNDefaults()
 #if LL_DARWIN || LL_LINUX
 	const float platformScale = 20.f;
 	const float platformScaleAvXZ = 1.f;
-	// The SpaceNavigator doesn't act as a 3D cursor on OS X / Linux. 
+	// The SpaceNavigator doesn't act as a 3D cursor on macOS / Linux.
 	const bool is_3d_cursor = false;
 #else
 	const float platformScale = 1.f;
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 3725510b6a..c4cd1779b7 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -5314,7 +5314,7 @@ std::string LLVivoxVoiceClient::nameFromID(const LLUUID &uuid)
 	LLStringUtil::replaceChar(result, '+', '-');
 	LLStringUtil::replaceChar(result, '/', '_');
 	
-	// If you need to transform a GUID to this form on the Mac OS X command line, this will do so:
+	// If you need to transform a GUID to this form on the macOS command line, this will do so:
 	// echo -n x && (echo e669132a-6c43-4ee1-a78d-6c82fff59f32 |xxd -r -p |openssl base64|tr '/+' '_-')
 	
 	// The reverse transform can be done with: