diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-12-10 22:38:19 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-12-10 22:38:19 -0500 |
| commit | cc8305cd2075e3e19f83bd6738ef31a12d1fb4c5 (patch) | |
| tree | 516fb0229663090575e2c2f0af6c689246482141 /indra/newview/llpanellogin.cpp | |
| parent | e9a744131d2c08c0c08214624e09f152e52b2731 (diff) | |
| parent | 19122e164ca2a3c1616619b220118344b1858cc8 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index af8db31fad..a5bfa18851 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -73,6 +73,11 @@ #include "llfloatertos.h" #include "lltrans.h" #include "llglheaders.h" +#include "llpanelloginlistener.h" + +#if LL_WINDOWS +#pragma warning(disable: 4355) // 'this' used in initializer list +#endif // LL_WINDOWS #define USE_VIEWER_AUTH 0 @@ -166,7 +171,8 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, mLogoImage(), mCallback(callback), mCallbackData(cb_data), - mHtmlAvailable( TRUE ) + mHtmlAvailable( TRUE ), + mListener(new LLPanelLoginListener(this)) { setFocusRoot(TRUE); |