livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initial fixes for 2025.07 to compile on MacOS

master
Hecklezz 2025-09-13 07:05:51 +10:00
parent 2d9b26a648
commit 6a522ed3fb
7 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llcommon/llpreprocessor.h
View File

@ -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

15
indra/llwindow/llwindowmacosx.cpp
View File

@ -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);
}
}

1
indra/newview/fsfloaterim.h
View File

@ -292,7 +292,6 @@ private:
S32 mInputEditorPad;
S32 mChatLayoutPanelHeight;
S32 mFloaterHeight;
uuid_vec_t mInvitedParticipants;
uuid_vec_t mPendingParticipants;

1
indra/newview/fsfloaternearbychat.h
View File

@ -161,7 +161,6 @@ private:
S32 mInputEditorPad;
S32 mChatLayoutPanelHeight;
S32 mFloaterHeight;
std::vector<LLChat> mMessageArchive;

2
indra/newview/llpanelface.h
View File

@ -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 };

2
indra/newview/llpanelpeople.h
View File

@ -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;

5
indra/newview/llstatusbar.h
View File

@ -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];