summaryrefslogtreecommitdiff
path: root/indra/newview/llloginhandler.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-09-07 13:58:19 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-09-07 13:58:19 -0700
commit78821c51a1f7d5fcc6e4a2678bfd3446ccfaee36 (patch)
tree51da53114f257ca57c2aa36da655019b75cf0269 /indra/newview/llloginhandler.cpp
parentc64bd7d5cb28fc221716e866ff9c9a28c22e69ce (diff)
parentfef401a1768bae9bfb23a13549fa3a5005f2c7ae (diff)
Merge from viewer-experience
Diffstat (limited to 'indra/newview/llloginhandler.cpp')
-rw-r--r--indra/newview/llloginhandler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp
index 48be251611..9b4f146332 100644
--- a/indra/newview/llloginhandler.cpp
+++ b/indra/newview/llloginhandler.cpp
@@ -30,13 +30,13 @@
// viewer includes
#include "llsecapi.h"
-#include "lllogininstance.h" // to check if logged in yet
-#include "llpanellogin.h" // save_password_to_disk()
+#include "lllogininstance.h" // to check if logged in yet
+#include "llpanellogin.h"
#include "llstartup.h" // getStartupState()
#include "llslurl.h"
#include "llviewercontrol.h" // gSavedSettings
#include "llviewernetwork.h" // EGridInfo
-#include "llviewerwindow.h" // getWindow()
+#include "llviewerwindow.h" // getWindow()
// library includes
#include "llmd5.h"