Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse Source 
Conflicts:
	indra/llcommon/llversionviewer.h
	indra/newview/English.lproj/InfoPlist.strings
	indra/newview/llappviewerlinux.cpp
This commit is contained in:
Siana Gearz
2010-10-18 14:01:09 +02:00
parent 3d60deaf31 58eff984da
commit 293e6a5487
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llappviewerlinux.cpp
View File

@@ -732,8 +732,26 @@ std::string LLAppViewerLinux::generateSerialNumber()
{
char serial_md5[MD5HEX_STR_SIZE];
serial_md5[0] = 0;
std::string best;
std::string uuiddir("/dev/disk/by-uuid/");
// TODO
// trawl /dev/disk/by-uuid looking for a good-looking UUID to grab
std::string this_name;
BOOL wrap = FALSE;
while (gDirUtilp->getNextFileInDir(uuiddir, "*", this_name, wrap))
{
if (this_name.length() > best.length() ||
(this_name.length() == best.length() &&
this_name > best))
{
// longest (and secondarily alphabetically last) so far
best = this_name;
}
}
// we don't return the actual serial number, just a hash of it.
LLMD5 md5( reinterpret_cast<const unsigned char*>(best.c_str()) );
md5.hex_digest(serial_md5);
return serial_md5;
}