SL-5522 Fix applying textuers and materials with limited restrictions to attachments

1. Texture picker now updates filter's permissions based on selection
2. Various panels now properly check permissions

1 files changed, 17 insertions, 0 deletions

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index c13376d0a6..7e399a6808 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1339,6 +1339,12 @@ void LLFloaterTexturePicker::setInventoryPickType(LLTextureCtrl::EPickInventoryT
     }
 }
 
+void LLFloaterTexturePicker::setImmediateFilterPermMask(PermissionMask mask)
+{
+    mImmediateFilterPermMask = mask;
+    mInventoryPanel->setFilterPermMask(mask);
+}
+
 void LLFloaterTexturePicker::onPickerCallback(const std::vector<std::string>& filenames, LLHandle<LLFloater> handle)
 {
     std::vector<std::string>::const_iterator iter = filenames.begin();
@@ -1526,6 +1532,17 @@ void LLTextureCtrl::setCanApply(bool can_preview, bool can_apply)
 	}
 }
 
+void LLTextureCtrl::setImmediateFilterPermMask(PermissionMask mask)
+{
+    mImmediateFilterPermMask = mask;
+
+    LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
+    if (floaterp)
+    {
+        floaterp->setImmediateFilterPermMask(mask);
+    }
+}
+
 void LLTextureCtrl::setVisible( BOOL visible ) 
 {
 	if( !visible )