From 6a522ed3fbcc7cb486db506ea2d4cf4c11845f64 Mon Sep 17 00:00:00 2001
From: Hecklezz <tj8@live.com.au>
Date: Sat, 13 Sep 2025 07:05:51 +1000
Subject: [PATCH] Initial fixes for 2025.07 to compile on MacOS

---
 indra/llcommon/llpreprocessor.h     | 11 +++++++++++
 indra/llwindow/llwindowmacosx.cpp   | 15 +++++++++------
 indra/newview/fsfloaterim.h         |  1 -
 indra/newview/fsfloaternearbychat.h |  1 -
 indra/newview/llpanelface.h         |  2 +-
 indra/newview/llpanelpeople.h       |  2 +-
 indra/newview/llstatusbar.h         |  5 -----
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index c08080223a..997987850e 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -97,6 +97,10 @@
 #      define LL_ARM64 1
 #elif LL_GNUC && (defined(__arm64__) || defined(__aarch64__))
 #      define LL_ARM64 1
+// <FS:TJ> Check if using clang
+#elif LL_CLANG && (defined(__arm64__) || defined(__aarch64__))
+#      define LL_ARM64 1
+// </FS:TJ>
 #elif LL_MSVC && _M_X64
 #      define LL_X86_64 1
 #      define LL_X86 1
@@ -105,6 +109,13 @@
 #elif LL_GNUC && ( defined(__amd64__) || defined(__x86_64__) )
 #      define LL_X86_64 1
 #      define LL_X86 1
+// <FS:TJ> Check if using clang
+#elif LL_CLANG && ( defined(__amd64__) || defined(__x86_64__) )
+#      define LL_X86_64 1
+#      define LL_X86 1
+#elif LL_CLANG && ( defined(__i386__) )
+#      define LL_X86 1
+// </FS:TJ>
 #elif LL_GNUC && ( defined(__i386__) )
 #      define LL_X86 1
 #endif
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index ab87f9baca..40ad023e4d 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -2452,13 +2452,16 @@ bool LLWindowMacOSX::getInputDevices(U32 device_type_filter,
 
 void LLWindowMacOSX::openFile(const std::string& file_name )
 {
-        LL_INFOS() << "Opening file " << file_name << LL_ENDL;
-    FSRef appRef;
-    OSStatus os_result = FSPathMakeRef((UInt8*)file_name.c_str(),
-                       &appRef,NULL);
-    if(os_result >= 0)
+    LL_INFOS() << "Opening file " << file_name << LL_ENDL;
+    CFURLRef url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault,
+                                                           (const UInt8*)file_name.c_str(),
+                                                           (CFIndex)file_name.size(),
+                                                           false);
+
+    if (url)
     {
-        os_result = LSOpenFSRef(&appRef, NULL);
+        OSStatus os_result = LSOpenCFURLRef(url, NULL);
+		CFRelease(url);
     }
 }
 
diff --git a/indra/newview/fsfloaterim.h b/indra/newview/fsfloaterim.h
index 3d20957063..182f0d6ae3 100644
--- a/indra/newview/fsfloaterim.h
+++ b/indra/newview/fsfloaterim.h
@@ -292,7 +292,6 @@ private:
 
     S32 mInputEditorPad;
     S32 mChatLayoutPanelHeight;
-    S32 mFloaterHeight;
 
     uuid_vec_t mInvitedParticipants;
     uuid_vec_t mPendingParticipants;
diff --git a/indra/newview/fsfloaternearbychat.h b/indra/newview/fsfloaternearbychat.h
index ee485e5498..f707fe35c9 100644
--- a/indra/newview/fsfloaternearbychat.h
+++ b/indra/newview/fsfloaternearbychat.h
@@ -161,7 +161,6 @@ private:
 
     S32 mInputEditorPad;
     S32 mChatLayoutPanelHeight;
-    S32 mFloaterHeight;
 
     std::vector<LLChat> mMessageArchive;
 
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index cd42328d28..11e72a4dc2 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -395,7 +395,7 @@ private:
 
     LLButton* mBtnAlign { nullptr };
     LLButton* mBtnAlignTex { nullptr };
-    LLButton* mBtnPbrFromInv { nullptr };
+    //LLButton* mBtnPbrFromInv { nullptr }; // <FS/> Done via texture picker
     LLButton* mBtnEditBbr { nullptr };
     LLButton* mBtnSaveBbr { nullptr };
 
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 279573e478..f171c5a5e0 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -169,7 +169,7 @@ private:
     // <FS:Ansariel> FIRE-4740: Friend counter in people panel
     LLTabContainer*         mFriendsTabContainer;
 
-    LLAccordionCtrl* mFriendsAccordion = nullptr;
+    //LLAccordionCtrl* mFriendsAccordion = nullptr; // <FS:Ansariel/> Friend list accordion replacement
     LLAccordionCtrlTab*     mFriendsAllTab = nullptr;
     LLAccordionCtrlTab*     mFriendsOnlineTab = nullptr;
 
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 20d15c34a2..600084fd48 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -321,13 +321,9 @@ public:
     void setRebakeStuck(bool stuck) { mRebakeStuck = stuck;} // <FS:LO> FIRE-7639 - Stop the blinking after a while
 
 private:
-    LLTextBox   *mTextBalance;
-    LLTextBox   *mTextHealth;
     LLTextBox   *mTextTime;
     LLTextBox   *mFPSText; // <FS:Ansariel> FIRE-14482: Show FPS in status bar
 
-    LLTextBox*  mTextParcelName;
-
     LLStatGraph *mSGBandwidth;
     LLStatGraph *mSGPacketLoss;
 
@@ -361,7 +357,6 @@ private:
     LLPanelNearByMedia* mPanelNearByMedia;
 
     LLPanel*                mParcelInfoPanel;
-    LLButton*               mInfoBtn;
     LLTextBox*              mParcelInfoText;
     LLTextBox*              mDamageText;
     LLIconCtrl*             mParcelIcon[ICON_COUNT];