summaryrefslogtreecommitdiff
path: root/indra/newview/llloginhandler.cpp
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2011-08-30 09:33:05 -0400
committerprep linden <prep@lindenlab.com>2011-08-30 09:33:05 -0400
commit6f2820bcd7b7ed06fefeca0e2c34c45ef77e4b62 (patch)
tree1ba73003f2b299d6ab1a2b968c5d15688be23692 /indra/newview/llloginhandler.cpp
parent71ac45a28b238bac4ac0cf43ee85f04589ffa116 (diff)
parent8cef480b96dc779c5879f74224fb0a185ee550f2 (diff)
merge
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"