From 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 15 Feb 2007 20:24:08 +0000
Subject: merge -r 57761:57967 im-email-session-3, removes database load from
 IM to email session tracking, introduces new format for email return
 addresses

---
 indra/llinventory/llinventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llinventory')

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>
-- 
cgit v1.2.3