From df4d167cd13fd89a85e4d30dca94e40c934707d7 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 21 Dec 2007 06:44:41 +0000
Subject: svn merge -r74200:76302
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer -->
 release

Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
---
 indra/llvfs/lldir.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llvfs/lldir.h')

diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h
index b133b7db61..4426935e5c 100644
--- a/indra/llvfs/lldir.h
+++ b/indra/llvfs/lldir.h
@@ -49,7 +49,8 @@ typedef enum ELLPath
 	LL_PATH_CHAT_LOGS = 12,
 	LL_PATH_PER_ACCOUNT_CHAT_LOGS = 13,
 	LL_PATH_MOZILLA_PROFILE = 14,
-	LL_PATH_COUNT = 15
+	LL_PATH_HTML = 15,
+	LL_PATH_COUNT = 16
 } ELLPath;
 
 
-- 
cgit v1.2.3