livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#3748 Don't allow dropping material onto water exclusion surface

master
Maxim Nikolenko 2025-04-30 15:06:56 +03:00 committed by GitHub
parent d9e55c4415
commit 98078b9aad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
indra/newview/lltooldraganddrop.cpp
View File

@ -2351,6 +2351,47 @@ EAcceptance LLToolDragAndDrop::dad3dRezScript(
return rv;
}
bool is_water_exclusion_face(LLViewerObject* obj, S32 face)
{
LLViewerTexture* image = obj->getTEImage(face);
if (!image)
return false;
// magic texture and alpha blending
bool exclude_water = (image->getID() == IMG_ALPHA_GRAD) && obj->isImageAlphaBlended(face);
// transparency
exclude_water &= (obj->getTE(face)->getColor().mV[VALPHA] == 1);
//absence of normal and specular textures
image = obj->getTENormalMap(face);
if (image && image != LLViewerFetchedTexture::sDefaultImagep)
exclude_water &= image->getID().isNull();
image = obj->getTESpecularMap(face);
if (image && image != LLViewerFetchedTexture::sDefaultImagep)
exclude_water &= image->getID().isNull();
return exclude_water;
}
bool is_water_exclusion_surface(LLViewerObject* obj, S32 face, bool all_faces)
{
if (all_faces)
{
bool exclude_water = false;
for (S32 it_face = 0; it_face < obj->getNumTEs(); it_face++)
{
exclude_water |= is_water_exclusion_face(obj, it_face);
}
return exclude_water;
}
else
{
return is_water_exclusion_face(obj, face);
}
}
EAcceptance LLToolDragAndDrop::dad3dApplyToObject(
LLViewerObject* obj, S32 face, MASK mask, bool drop, EDragAndDropType cargo_type)
{
@ -2441,7 +2482,13 @@ EAcceptance LLToolDragAndDrop::dad3dApplyToObject(
else if (cargo_type == DAD_MATERIAL)
{
bool all_faces = mask & MASK_SHIFT;
if (item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()))
if (is_water_exclusion_surface(obj, face, all_faces))
{
LLNotificationsUtil::add("WaterExclusionNoMaterial");
return ACCEPT_NO;
}
else if (item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()))
{
dropMaterial(obj, face, item, mSource, mSourceID, all_faces);
}

9
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -12610,4 +12610,13 @@ are wearing now.
notext="Cancel"
yestext="Continue"/>
</notification>
<notification
icon="notify.tga"
name="WaterExclusionNoMaterial"
persist="true"
type="notify">
Unable to apply material to the water exclusion surface.
<tag>fail</tag>
</notification>
</notifications>