summaryrefslogtreecommitdiff
path: root/indra/newview/llloginhandler.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-08-29 12:23:28 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-08-29 12:23:28 -0400
commit5a39c44b56191a4ba516d3c504b3a0a574156e72 (patch)
treee95e5fc6cde0a046ac88abeba4a3410123cae890 /indra/newview/llloginhandler.cpp
parentf5a890453b0a98636e6267b3272567ae0eecf1e4 (diff)
parent68a15f73c190d2a803ad8b11ed8d9b32bc9e46ee (diff)
merged .hgtags
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"