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;
}

5
indra/newview/llfloatertos.cpp
View File

@@ -155,10 +155,7 @@ BOOL LLFloaterTOS::postBuild()
// disable Agree to TOS radio button until the page has fully loaded
LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
// <edit>
// UHHHH NO :>
tos_agreement->setEnabled( true );
// </edit>
tos_agreement->setEnabled( false );
// hide the SL text widget if we're displaying TOS with using a browser widget.
LLTextEditor *editor = getChild<LLTextEditor>("tos_text");

20
indra/newview/llpanelface.cpp
View File

@@ -51,6 +51,7 @@
#include "llcombobox.h"
#include "lldrawpoolbump.h"
#include "llface.h"
#include "llinventorymodel.h" //Perms check for texture params
#include "lllineeditor.h"
#include "llresmgr.h"
#include "llselectmgr.h"
@@ -1183,8 +1184,22 @@ void LLPanelFace::onClickCopy(void* userdata)
textures.clear();
for (S32 i = 0; i < te_count; i++)
{
LLSD tex_params = objectp->getTE(i)->asLLSD();
LLInventoryItem* itemp = gInventory.getItem(objectp->getTE(i)->getID());
LLUUID tex = tex_params["imageid"];
tex_params["imageid"] = LLUUID::null;
gSavedPerAccountSettings.setLLSD("Image.Settings", tex_params);
if (itemp)
{
LLPermissions perms = itemp->getPermissions();
//full perms
if (perms.getMaskOwner() & PERM_ITEM_UNRESTRICTED)
{
tex_params["imageid"] = tex;
}
}
llinfos << "Copying params on face " << i << "." << llendl;
textures.append(objectp->getTE(i)->asLLSD());
textures.append(tex_params);
}
}
@@ -1215,6 +1230,9 @@ void LLPanelFace::onClickPaste(void* userdata)
for (int i = 0; i < textures.size(); i++)
{
llinfos << "Pasting params on face " << i << "." << llendl;
LLSD cur_tex = objectp->getTE(i)->asLLSD();
if (textures[i]["imageid"].asUUID() == LLUUID::null)
textures[i]["imageid"] = cur_tex["imageid"];
LLTextureEntry tex;
tex.fromLLSD(textures[i]);
obj.setTE(U8(i), tex);