diff options
author | Graham Linden <graham@lindenlab.com> | 2018-06-21 18:40:18 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-06-21 18:40:18 +0100 |
commit | 2c0583a2719faabd32415782e2326858e0557d0e (patch) | |
tree | 50a5845ebd39fba7bb428d145404de85ed30e499 /indra/newview/llpanelgroupgeneral.cpp | |
parent | 91121d113d25af570ec64564dd10c21f0d5fcb69 (diff) | |
parent | ea75559674a8ac6d48fbf511880b1a79cbb7642d (diff) |
Merge 5.1.7
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.cpp')
-rw-r--r-- | indra/newview/llpanelgroupgeneral.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index d17f5494a0..f85a2ffbc1 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -194,6 +194,7 @@ void LLPanelGroupGeneral::setupCtrls(LLPanel* panel_group) if (mInsignia) { mInsignia->setCommitCallback(onCommitAny, this); + mInsignia->setAllowLocalTexture(FALSE); } mFounderName = getChild<LLTextBox>("founder_name"); |