diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-27 22:58:40 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-27 22:58:40 -0700 |
| commit | 0ffba7c663e4ebc143ff4f2ebd716370927b1623 (patch) | |
| tree | 4a5a04dcc8fe9fadd89f6a2225408db822752f6a /indra/newview/llappviewer.cpp | |
| parent | d7144e76bf134897fca31cb6ac91b7894dc02ae3 (diff) | |
| parent | 495f62298c78fdc36078a7e7ea3e7012a883a93a (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 475a075d7e..ca9830e1a0 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -195,6 +195,7 @@ // Include for security api initialization #include "llsecapi.h" +#include "llmachineid.h" // *FIX: These extern globals should be cleaned up. // The globals either represent state/config/resource-storage of either @@ -619,6 +620,7 @@ bool LLAppViewer::init() // *NOTE:Mani - LLCurl::initClass is not thread safe. // Called before threads are created. LLCurl::initClass(); + LLMachineID::init(); initThreads(); writeSystemInfo(); |