diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-08 16:20:25 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-08 16:20:25 -0500 |
| commit | 45b24808657dddfb2a605186416409b453f149e7 (patch) | |
| tree | 298c49cfd6fb4f645a3a776a75b9bb64601bf9c3 /indra/newview/llstartup.cpp | |
| parent | 7ce49586881fd078ea8bceeab558b4a156b30f63 (diff) | |
| parent | 37848d29d9030e00086c3a499d28237cdf943e1b (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 58df2ffb19..be0c92a76d 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -77,7 +77,7 @@ #include "llsecondlifeurls.h" #include "llstring.h" #include "lluserrelations.h" -#include "llversionviewer.h" +#include "llversioninfo.h" #include "llviewercontrol.h" #include "llvfs.h" #include "llxorcipher.h" // saved password, MAC address @@ -542,9 +542,9 @@ bool idle_startup() if(!start_messaging_system( message_template_path, port, - LL_VERSION_MAJOR, - LL_VERSION_MINOR, - LL_VERSION_PATCH, + LLVersionInfo::getMajor(), + LLVersionInfo::getMinor(), + LLVersionInfo::getPatch(), FALSE, std::string(), responder, |