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

Added macro around texture exporter to ensure tpv compliance, started messing with develop.py

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-19 23:12:15 -03:00
parent 0dbd278707
commit 929694dc07
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llappviewerlinux.cpp
View File

@@ -809,7 +809,7 @@ std::string LLAppViewerLinux::generateSerialNumber()
}
else
{
llerrs << "Couldn't open /dev/disk/by-uuid/" << llendl;
llwarns << "Couldn't open /dev/disk/by-uuid/" << llendl;
}
if(rootDeviceName != "" && rootDeviceUUID != "")
@@ -823,7 +823,7 @@ std::string LLAppViewerLinux::generateSerialNumber()
}
else
{
llinfos << "Could not find root device's UUID" << llendl;
llwarns << "Could not find root device's UUID" << llendl;
}
#endif
return serial_md5;

21
indra/newview/lltoolpie.cpp
View File

@@ -158,6 +158,27 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
LLViewerObject *object = mPick.getObject();
LLViewerObject *parent = NULL;
#ifdef OPENSIM_RULES
#warn "DICKS IN MY BUTT"
if(mPick.mKeyMask == MASK_SHIFT)
{
if(object)
{
U8 face = mPick.mObjectFace & 0xff;
if(face < object->getNumTEs())
{
LLViewerImage* img = object->getTEImage(face);
if(img)
{
LLUUID image_id = img->getID();
LLInventoryBridge::open_texture(image_id, std::string(image_id), true, LLUUID::null ,true);
}
}
}
return TRUE;
}
#endif /* OPENSIM_RULES */
if (mPick.mPickType != LLPickInfo::PICK_LAND)
{
LLViewerParcelMgr::getInstance()->deselectLand();