diff options
| author | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
| commit | e0432f98ee515f9777604aa784d28b63d2abfe40 (patch) | |
| tree | 398fcae43d9904bde2112a7085c7ef7c1a926100 /indra/newview/llhints.cpp | |
| parent | bf87920fc91e2ca2b8d9f6f2656ad632c3005164 (diff) | |
| parent | f5a47417fde70f78b99744386c6da0bcf78e60d5 (diff) | |
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
Diffstat (limited to 'indra/newview/llhints.cpp')
| -rw-r--r-- | indra/newview/llhints.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp index e15862e2a4..197408b40e 100644 --- a/indra/newview/llhints.cpp +++ b/indra/newview/llhints.cpp @@ -171,12 +171,12 @@ LLHintPopup::LLHintPopup(const LLHintPopup::Params& p) } if (p.hint_image.isProvided()) { - buildFromFile("panel_hint_image.xml", NULL, p); + buildFromFile("panel_hint_image.xml", p); getChild<LLIconCtrl>("hint_image")->setImage(p.hint_image()); } else { - buildFromFile( "panel_hint.xml", NULL, p); + buildFromFile( "panel_hint.xml", p); } } |