diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-10-02 14:19:16 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-10-02 14:19:16 -0500 |
| commit | 942df58666407b405ed4f82e05dea19dcc1a9f18 (patch) | |
| tree | a18ddf43684f9a7099ee4ed9c58ca16bd59d78ec /indra/newview/llmaterialeditor.h | |
| parent | bc4e90ea5e462662f90c860d69aaa53b88f189c5 (diff) | |
| parent | 153bd41bebae9f41e7c5e88dc54526eee152f6cf (diff) | |
Merge branch 'DRTVWR-559' of 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(); |