Merge remote-tracking branch 'origin/main'

indra/llwindow/llwindowmacosx-objc.h

@@ -175,6 +175,6 @@ NSWindowRef getMainAppWindow();
 GLViewRef getGLView();
 
 unsigned int getModifiers();
-void setTitle(const std::string& title);
+void setWindowTitle(const std::string& title);
 
 #endif // LL_LLWINDOWMACOSX_OBJC_H

indra/llwindow/llwindowmacosx-objc.mm

@@ -442,7 +442,7 @@ unsigned int getModifiers()
 	return [NSEvent modifierFlags];
 }
 
-void setTitle(const std::string& title)
+void setWindowTitle(const std::string& title)
 {
     @autoreleasepool {
         LLNSWindow *winRef = [(LLAppDelegate*)[[LLApplication sharedApplication] delegate] window];

indra/llwindow/llwindowmacosx.cpp

@@ -1257,7 +1257,7 @@ BOOL LLWindowMacOSX::copyTextToClipboard(const LLWString &s)
 
 void LLWindowMacOSX::setTitle(const std::string title)
 {
-	setTitle(title);
+	setWindowTitle(title);
 }
 
 // protected