From 3b2515fd5ff832fa5faa5384b2c3db919d960509 Mon Sep 17 00:00:00 2001 From: Tess Chu Date: Fri, 10 Aug 2007 02:15:37 +0000 Subject: merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla. Added tests to version manager and fixed failed tests. Paired by rdw and Tess. --- indra/newview/llstartup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 20761ded11..74d8aa8e9a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -44,7 +44,7 @@ #include "llsecondlifeurls.h" #include "llstring.h" #include "lluserrelations.h" -#include "llversion.h" +#include "llversionviewer.h" #include "llvfs.h" #include "llwindow.h" // for shell_open #include "llxorcipher.h" // saved password, MAC address -- cgit v1.2.3