diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 15:07:17 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 15:07:17 -0800 |
| commit | ea0461c01287a2b026b5621616fb811bfc2d68a2 (patch) | |
| tree | f1e94df52aa6f5a68f008278cbaec0eaca063a4a /indra/newview/llhints.cpp | |
| parent | 76990fab4f3c73ab1b2051421c52444de28f9d32 (diff) | |
| parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
Pull and merge https://bitbucket.org/lindenlab/viewer-development.
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); } } |