diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-10-01 13:39:35 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-10-01 13:39:35 +0800 |
| commit | dcdd85e4342305bf363c76e6de1e8f8e0ea8840d (patch) | |
| tree | eedd18efe98fc65b2244557a79d10b99c993ad7c /indra/newview/llmaterialeditor.h | |
| parent | 5dfad9ddbb5c7dce635ba01f3fe480bd42896532 (diff) | |
| parent | a95ad7aac7248c5b81e5d9dd9e606b5ecb61e301 (diff) | |
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llmaterialeditor.h')
| -rw-r--r-- | indra/newview/llmaterialeditor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index b29db706f8..1c40fcc348 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -110,7 +110,6 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener void onSelectionChanged(); // live overrides selection changes static void updateLive(); - static void updateLive(const LLUUID &object_id, S32 te); static void loadLive(); static bool canModifyObjectsMaterial(); |