diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-08-10 02:15:37 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-08-10 02:15:37 +0000 |
| commit | 3b2515fd5ff832fa5faa5384b2c3db919d960509 (patch) | |
| tree | 0206223e8f0987dfe07c402c9ca99cee6685a849 /indra/newview/llstartup.cpp | |
| parent | 52cb2aea8667056671b67a3c70eeefd00a061751 (diff) | |
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.
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 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 |