diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-10-20 11:34:46 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-10-20 11:34:46 -0400 |
| commit | aa75245a1aee3b64aeed31744e58fe96afa1ce7e (patch) | |
| tree | 843dbbd193417ddd2f8dd6afd3c8137b4ed3d1a0 /indra/newview/llappviewer.cpp | |
| parent | d9e61b280f834445e30cce65c61455688ba58541 (diff) | |
| parent | 7aff3d0842475de4b0bb3bc33d5b4cc86a056623 (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 // |