diff options
| author | Palmer <palmer@lindenlab.com> | 2009-12-08 10:00:32 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-12-08 10:00:32 -0800 |
| commit | 74f2cb2a70ddad7fe8819fd6855831e0615dc8d5 (patch) | |
| tree | 61f2ce7a6cfb5963b7517a582164047a6833757b /indra/newview/llstartup.cpp | |
| parent | cd138869d5bfcf40d3d13d7b887e36263e2919d9 (diff) | |
| parent | e07ef0d0e0e8cbd58afd4c6ee970634bd2f783e7 (diff) | |
Grabbed more viewer 2 changes that should fix parabuild problem
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, |