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/llinventory/llinventory.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/llinventory/llinventory.cpp')
| -rw-r--r-- | indra/llinventory/llinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 124f22d5cf..2e3db2308f 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -13,7 +13,7 @@ #include "llinventory.h" #include "lldbstrings.h" -#include "llcrypto.h" +#include "llxorcipher.h" #include "llsd.h" #include "message.h" #include <boost/tokenizer.hpp> |