diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:27:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:27:34 -0400 |
| commit | e6239b7978fb9f05d2c8c7cf42b9277f4a5f7c52 (patch) | |
| tree | 17080b4ffa8a59a5b9c158edaf9e60f9af2a67b4 /indra/newview/llloginhandler.cpp | |
| parent | 66cac05cfb1236c3c1607dff27babf873c29a679 (diff) | |
| parent | 6484dbf28cb8b6ffa745fe9b26beae58d3c68441 (diff) | |
merge changes for storm-1571
Diffstat (limited to 'indra/newview/llloginhandler.cpp')
| -rw-r--r-- | indra/newview/llloginhandler.cpp | 6 |
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" |