diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-19 11:24:57 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-19 11:24:57 -0800 |
| commit | f50b58a11b54d19a7a3f54d8bfd77fb5ce13b6f3 (patch) | |
| tree | 5f2e26da4b949547a124aa3d088316b5deeca322 /indra/newview/lltoast.cpp | |
| parent | d7b55d0fa7f7f00a3811e62a9874999e9e0d0a8a (diff) | |
| parent | 185169cbbecebe2a35dbd937d6fb4e0a30fa1832 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/lltoast.cpp')
| -rw-r--r-- | indra/newview/lltoast.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 0eec7f0afd..9dfb29b905 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -118,7 +118,7 @@ LLToast::LLToast(const LLToast::Params& p) { mTimer.reset(new LLToastLifeTimer(this, p.lifetime_secs)); - buildFromFile("panel_toast.xml", NULL); + buildFromFile("panel_toast.xml"); setCanDrag(FALSE); |