summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2023-11-30 12:19:38 -0600
committerGitHub <noreply@github.com>2023-11-30 12:19:38 -0600
commita09b083b1b18d293d97dd84dd4849924b2766a4f (patch)
tree6f0cbfd33d0cf125432ad0b8b93a2b052143ee14 /indra/newview/lltexturectrl.cpp
parent68875523e09f9fe06fc4b3cd5225995bb13966c3 (diff)
parent88aefc95eace0bb8ea21cb44514d41d98bdf74cc (diff)
Merge branch 'DRTVWR-596' into davep/SL-20611
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r--indra/newview/lltexturectrl.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index f302426a43..28e01c6c21 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1715,6 +1715,12 @@ void LLTextureCtrl::setImmediateFilterPermMask(PermissionMask mask)
}
}
+void LLTextureCtrl::setFilterPermissionMasks(PermissionMask mask)
+{
+ setImmediateFilterPermMask(mask);
+ setDnDFilterPermMask(mask);
+}
+
void LLTextureCtrl::setVisible( BOOL visible )
{
if( !visible )