Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext

1 files changed, 5 insertions, 5 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index c30bf35..7040cd1 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -179,7 +179,6 @@
 
 #include "hippogridmanager.h"
 #include "hippolimits.h"
-#include "hippoupdate.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -616,6 +615,11 @@ bool LLAppViewer::init()
         // Always add the version to the top of the log--makes debugging easier -- MC
         llinfos << ViewerInfo::prettyInfo() << llendl;
 
+        // Always fetch the Ethernet MAC address, needed both for login
+        // and password load.  Need to do this before initConfiguration(),
+        // as the password loading part needs the MAC.
+        LLUUID::getNodeID(gMACAddress);
+
     if (!initConfiguration())
                 return false;
 
@@ -748,10 +752,6 @@ bool LLAppViewer::init()
                 return false;
         }
 
-        // Always fetch the Ethernet MAC address, needed both for login
-        // and password load.
-        LLUUID::getNodeID(gMACAddress);
-
         // Prepare for out-of-memory situations, during which we will crash on
         // purpose and save a dump.
 #if LL_WINDOWS && LL_RELEASE_FOR_DOWNLOAD && LL_USE_SMARTHEAP