diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-27 16:25:02 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-27 16:25:02 -0400 |
| commit | d020dae7b9c156a08d1dd17eade7f36011f4d0fe (patch) | |
| tree | 67b1a28222116b20c5fa7bcc1cbd86ca47a91aa7 /indra/newview/llviewernetwork.cpp | |
| parent | 745845f79987e4b4ab7f5728746a0eda8898930f (diff) | |
| parent | 70600ea66adc816e72e91e804deebde40ed6b1bc (diff) | |
Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
| -rw-r--r-- | indra/newview/llviewernetwork.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 918b15ef09..801c46035a 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -35,6 +35,8 @@ #include "llviewernetwork.h" #include "llviewercontrol.h" +#include "llevents.h" +#include "lllogin.h" struct LLGridData { @@ -155,6 +157,10 @@ LLViewerLogin::LLViewerLogin() : { } + LLViewerLogin::~LLViewerLogin() + { + } + void LLViewerLogin::setGridChoice(EGridInfo grid) { if(grid < 0 || grid >= GRID_INFO_COUNT) |