summaryrefslogtreecommitdiff
path: root/indra/newview/llviewernetwork.cpp
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-09-18 15:22:25 -0400
committerbrad kittenbrink <brad@lindenlab.com>2009-09-18 15:22:25 -0400
commitbb1d4592bdc83f23a60c864ef291c58912d93935 (patch)
treedfb29728340b1fef59227775ecc47aaab117fdd2 /indra/newview/llviewernetwork.cpp
parent91645140d495da4faf1e4905bb8b96c6af579277 (diff)
parent8e7ba92eb9e0371385e3de9a76cc11355be8a974 (diff)
Merged latest viewer/viewer-20 into login-api.
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
-rw-r--r--indra/newview/llviewernetwork.cpp6
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)