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

Add default object texture id to perms check

Browse Source
This commit is contained in:
Inusaito Sayori
2013-08-08 20:32:02 -04:00
parent fb32e500dc
commit 7a2a7f531f
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llpanelobject.cpp
View File

@@ -2484,6 +2484,7 @@ namespace
bool texturePermsCheck(const LLUUID& id) bool texturePermsCheck(const LLUUID& id)
{ {
return (id.notNull() && !gInventory.isObjectDescendentOf(id, gInventory.getLibraryRootFolderID()) return (id.notNull() && !gInventory.isObjectDescendentOf(id, gInventory.getLibraryRootFolderID())
&& id != LLUUID(gSavedSettings.getString("DefaultObjectTexture"))
&& id != LLUUID(gSavedSettings.getString("UIImgWhiteUUID")) && id != LLUUID(gSavedSettings.getString("UIImgWhiteUUID"))
&& id != LLUUID(gSavedSettings.getString("UIImgInvisibleUUID")) && id != LLUUID(gSavedSettings.getString("UIImgInvisibleUUID"))
&& id != LLUUID(std::string("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903")) // alpha && id != LLUUID(std::string("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903")) // alpha