diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-10-17 12:23:38 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-10-17 12:23:38 -0400 |
| commit | 4ea9361aa8f4580f1f7bc5eb819236bf5f1dd768 (patch) | |
| tree | d3f73abddbfe39a6e833385a517c5afd866f838b /indra/newview/llappviewer.cpp | |
| parent | b4275c5d48c8cdf4bbe206822878fcf615897ac9 (diff) | |
| parent | 27cadfbe951abb2cf350d5a1c91876ac958d50cf (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 4cb3b92476..5b769dcab4 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -205,7 +205,7 @@ #pragma warning (disable:4702) #endif -static LLAppViewerListener sAppViewerListener("LLAppViewer", NULL); +static LLAppViewerListener sAppViewerListener("LLAppViewer", LLAppViewer::instance); ////// Windows-specific includes to the bottom - nasty defines in these pollute the preprocessor // |