diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:27:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 13:27:52 -0400 |
| commit | 4057afd29161ad9cb69674ee608e48bc9e46a559 (patch) | |
| tree | 058c53cb19d9b3e85fb0f9b70623c563704cdf17 /indra/newview/llloginhandler.cpp | |
| parent | 0f1dea30f827f920d2323d9450826f1a4baaa10b (diff) | |
| parent | 7c222dfd136a4bb97700b390f8adbef6fe67cf5d (diff) | |
merge changes for storm-1268
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" |