diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:15:46 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:15:46 -0400 |
commit | 1b5f0590ce45ce6e540d266a8902af5839885cfb (patch) | |
tree | f923407fc28fb2f046ac451976a02490ab15787e /indra/newview/llfloateravatarrendersettings.cpp | |
parent | f822193974af363fa4bb0208dc02848be6c983a2 (diff) | |
parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) |
Merge commit 'e7eced3' into nat/releaseos for whitespace fix.
Diffstat (limited to 'indra/newview/llfloateravatarrendersettings.cpp')
-rw-r--r-- | indra/newview/llfloateravatarrendersettings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloateravatarrendersettings.cpp b/indra/newview/llfloateravatarrendersettings.cpp index 7d098e6c88..bc860308b3 100644 --- a/indra/newview/llfloateravatarrendersettings.cpp +++ b/indra/newview/llfloateravatarrendersettings.cpp @@ -70,8 +70,8 @@ static LLAvatarRenderMuteListObserver sAvatarRenderMuteListObserver; LLFloaterAvatarRenderSettings::LLFloaterAvatarRenderSettings(const LLSD& key) : LLFloater(key), - mAvatarSettingsList(NULL), - mNeedsUpdate(false) + mAvatarSettingsList(NULL), + mNeedsUpdate(false) { mContextMenu = new LLSettingsContextMenu(this); LLRenderMuteList::getInstance()->addObserver(&sAvatarRenderMuteListObserver); @@ -90,7 +90,7 @@ BOOL LLFloaterAvatarRenderSettings::postBuild() mAvatarSettingsList = getChild<LLNameListCtrl>("render_settings_list"); mAvatarSettingsList->setRightMouseDownCallback(boost::bind(&LLFloaterAvatarRenderSettings::onAvatarListRightClick, this, _1, _2, _3)); - return TRUE; + return TRUE; } void LLFloaterAvatarRenderSettings::draw() |