Skip to content
Snippets Groups Projects
Commit 32f1b2fd authored by Logue's avatar Logue
Browse files

Merge branch 'main' of git.alchemyviewer.org:alchemy/alchemy-next

parents 38e0f040 6abb94ef
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
Hide whitespace changes
Inline Side-by-side
indra/newview/llfloatertexturepicker.h
+ 1
− 0
View file @ 32f1b2fd
...@@ -130,6 +130,7 @@ class LLFloaterTexturePicker final : public LLFloater ...@@ -130,6 +130,7 @@ class LLFloaterTexturePicker final : public LLFloater
protected: protected:
void refreshLocalList(); void refreshLocalList();
void refreshInventoryFilter(); void refreshInventoryFilter();
void setImageIDFromItem(const LLInventoryItem* itemp, bool set_selection = true);
LLPointer<LLViewerTexture> mTexturep; LLPointer<LLViewerTexture> mTexturep;
LLPointer<LLFetchedGLTFMaterial> mGLTFMaterial; LLPointer<LLFetchedGLTFMaterial> mGLTFMaterial;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment