summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.h
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-06-07 08:58:15 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-06-07 08:58:15 -0700
commit7e4e59470f36ae7a0e01b8d2613af4c8fb6b0101 (patch)
tree3ebbc7ae029d14b3a2f033b09fcd3fe9460cb1bf /indra/newview/llselectmgr.h
parentc38204f5e0a9130f0d4d4bfc997da107fd1017ce (diff)
NORSPEC-233 WIP for individual material param edits across hetero object selections
Diffstat (limited to 'indra/newview/llselectmgr.h')
-rwxr-xr-xindra/newview/llselectmgr.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index f9b97cebdd..d4b736640c 100755
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -85,6 +85,12 @@ struct LLSelectedTEFunctor
virtual bool apply(LLViewerObject* object, S32 face) = 0;
};
+struct LLSelectedTEMaterialFunctor
+{
+ virtual ~LLSelectedTEMaterialFunctor() {};
+ virtual LLMaterialPtr apply(LLViewerObject* object, S32 face, LLTextureEntry* tep, LLMaterialPtr& current_material) = 0;
+};
+
template <typename T> struct LLSelectedTEGetFunctor
{
virtual ~LLSelectedTEGetFunctor() {};
@@ -549,7 +555,7 @@ public:
void selectionSetClickAction(U8 action);
void selectionSetIncludeInSearch(bool include_in_search);
void selectionSetGlow(const F32 glow);
- void selectionSetMaterial(LLMaterialPtr material);
+ void selectionSetMaterialParams(LLSelectedTEMaterialFunctor* material_func);
void selectionRemoveMaterial();
void selectionSetObjectPermissions(U8 perm_field, BOOL set, U32 perm_mask, BOOL override = FALSE);