diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-07-30 19:39:08 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-07-30 19:39:08 -0700 |
| commit | a7efd0d8ddb68315653265d7e4ab87a156e56560 (patch) | |
| tree | 4210ae49796fdb8fb4b28f0bdd857dc338110070 /indra/newview/llviewernetwork.cpp | |
| parent | b3a83059c464c9a974d547f57ab8e93ca0bee0f1 (diff) | |
| parent | 29607ab70edea79cfdceaa52d632d77e6699cb8f (diff) | |
Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups.
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) |