diff options
| author | James Cook <james@lindenlab.com> | 2007-02-15 20:24:08 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2007-02-15 20:24:08 +0000 |
| commit | 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 (patch) | |
| tree | 189b9bc4e3bfa63275cc41be8dc42a28b0f54ffe /indra/newview/llstartup.cpp | |
| parent | 4feabe4a9caec380cad405d5410bc762c862113d (diff) | |
merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 4ff07e9976..7bd6c9ad82 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -25,7 +25,6 @@ #include "audiosettings.h" #include "llcachename.h" #include "llviewercontrol.h" -#include "llcrypto.h" #include "lldir.h" #include "lleconomy.h" #include "llerrorcontrol.h" @@ -46,6 +45,7 @@ #include "llversion.h" #include "llvfs.h" #include "llwindow.h" // for shell_open +#include "llxorcipher.h" // saved password, MAC address #include "message.h" #include "v3math.h" |