summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-06-22 15:19:16 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2010-06-22 15:19:16 -0700
commit87082996e6408919591ee3d408918a4425494dc9 (patch)
tree2fd06a31bac1cf50075a5af0886d1a0a70c8b935 /indra/newview
parenta42cf03807385c214118298821d532f5b6b4d984 (diff)
Revert to previous implementation of getNodeId.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lllogininstance.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 71604291e1..06f490e8e3 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -168,7 +168,9 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia
char hashed_mac_string[MD5HEX_STR_SIZE]; /* Flawfinder: ignore */
LLMD5 hashed_mac;
unsigned char MACAddress[MAC_ADDRESS_BYTES];
- LLUUID::getNodeID(MACAddress);
+ if(LLUUID::getNodeID(MACAddress) == 0) {
+ llerrs << "Failed to get node id; cannot uniquely identify this machine." << llendl;
+ }
hashed_mac.update( MACAddress, MAC_ADDRESS_BYTES );
hashed_mac.finalize();
hashed_mac.hex_digest(hashed_mac_string);