diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-28 17:01:46 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-28 17:01:46 -0400 |
| commit | ea7047579da5d252aac34e69dabe9e9e9002a2fb (patch) | |
| tree | fcb26ecad7417083d6b2f0fcee651f95364d2ec8 /indra/newview/llappviewer.cpp | |
| parent | 7efaa216a1c42ed85663bcf2c7d0ef6df718c780 (diff) | |
| parent | bb973c38e30bc0711265ba04630a8475a3f98c59 (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(); |