summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateravatarrendersettings.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-05-16 01:08:13 +0300
committerGitHub <noreply@github.com>2024-05-16 01:08:13 +0300
commitd41e167aa9a22b446cbcfe6fd4ebdd810c61ba73 (patch)
tree3ed50d019b3d78c748ed6b46ca69f2ca7943f41a /indra/newview/llfloateravatarrendersettings.cpp
parent29be88d60d654193926add496d2d851f7c217356 (diff)
parentbdb8caf790207e1a6f46d495a586b38bb52e58e9 (diff)
Merge pull request #1478 from secondlife/marchcat/x-mf-merge
Maint X -> Materials Featurette merge
Diffstat (limited to 'indra/newview/llfloateravatarrendersettings.cpp')
-rw-r--r--indra/newview/llfloateravatarrendersettings.cpp6
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()