diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-09 19:14:20 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-09 19:14:20 +0200 |
| commit | b9d0bc8c8e356e65a1dccf9727c1463ec797f2f4 (patch) | |
| tree | a8409a477d697652aecaf487f3cc0c8d6c5483b1 /indra/newview/llstartup.cpp | |
| parent | bf4cbc517ce14bcceb0ee890c541a8973fee62a9 (diff) | |
| parent | b24cbb3633594ed7a7ebde1701175cbe33608dea (diff) | |
merge
--HG--
branch : product-engine
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, |