Skip to content

Commit

Permalink
fix build warnings (treated as errors) on darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewMeadows committed Dec 12, 2023
1 parent e8d94ba commit e8da607
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion indra/newview/llfloaterpreference.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3152,7 +3152,7 @@ bool LLPanelPreferenceGameControl::isWaitingForInputChannel()
// static
void LLPanelPreferenceGameControl::applyGameControlInput(const LLGameControl::InputChannel& channel)
{
if (gSelectedItem && channel.mType != LLPanelPreferenceGameControl::TYPE_UNKNOWN)
if (gSelectedItem && channel.mType != (U8)(LLPanelPreferenceGameControl::TYPE_UNKNOWN))
{
S32 cell_index = gSelectedItem->getSelectedCell();
if (cell_index > 0)
Expand Down
17 changes: 9 additions & 8 deletions indra/newview/llfloaterpreference.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
// update Show Favorites checkbox
static void updateShowFavoritesCheckbox(bool val);

void processProperties( void* pData, EAvatarProcessorType type );
void processProperties( void* pData, EAvatarProcessorType type ) override;
void saveAvatarProperties( void );
static void saveAvatarPropertiesCoro(const std::string url, bool allow_publish);
void selectPrivacyPanel();
Expand Down Expand Up @@ -170,7 +170,7 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
void setPersonalInfo(const std::string& visibility);
void refreshEnabledState();
void onCommitWindowedMode();
void refresh(); // Refresh enable/disable
void refresh() override; // Refresh enable/disable
// if the quality radio buttons are changed
void onChangeQuality(const LLSD& data);

Expand Down Expand Up @@ -299,7 +299,7 @@ class LLPanelPreferenceGraphics : public LLPanelPreference
void cancel() override;
void saveSettings() override;
void resetDirtyChilds();
void setHardwareDefaults();
void setHardwareDefaults() override;
void setPresetText();

static const std::string getPresetsPath();
Expand Down Expand Up @@ -383,7 +383,7 @@ class LLPanelPreferenceGameControl : public LLPanelPreference
void apply() override;
void loadDefaults();
void loadSettings();
void saveSettings() override;
void saveSettings() override;
void updateEnabledState();

//void onClickActionsAsGameControl();
Expand All @@ -404,8 +404,9 @@ class LLPanelPreferenceGameControl : public LLPanelPreference
bool addTableRows(LLScrollListCtrl* table, const std::string &filename);
void addTableSeparator(LLScrollListCtrl* table);
void updateTable();
LOG_CLASS(LLPanelPreferenceGameControl);

LLScrollListCtrl* mActionTable;
LLScrollListCtrl* mActionTable;
LLGameControlTranslator mActionTranslator;
};

Expand Down Expand Up @@ -434,12 +435,12 @@ class LLFloaterPreferenceProxy : public LLFloater

protected:
BOOL postBuild() override;
void onOpen(const LLSD& key);
void onClose(bool app_quitting);
void onOpen(const LLSD& key) override;
void onClose(bool app_quitting) override;
void saveSettings();
void onBtnOk();
void onBtnCancel();
void onClickCloseBtn(bool app_quitting = false);
void onClickCloseBtn(bool app_quitting = false) override;

void onChangeSocksSettings();

Expand Down

0 comments on commit e8da607

Please sign in to comment.