<feed xmlns='http://www.w3.org/2005/Atom'>
<title>viewer.git/indra/newview/llmaterialeditor.cpp, branch 26.1.1</title>
<subtitle>Megapahit's fork of the Second Life viewer.
</subtitle>
<id>https://www.megapahit.org/viewer.git/atom?h=26.1.1</id>
<link rel='self' href='https://www.megapahit.org/viewer.git/atom?h=26.1.1'/>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/'/>
<updated>2025-12-01T10:46:57Z</updated>
<entry>
<title>#5078 Replace boost::function with std::function</title>
<updated>2025-12-01T10:46:57Z</updated>
<author>
<name>Rye</name>
<email>rye@alchemyviewer.org</email>
</author>
<published>2025-12-01T10:46:57Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=fb3f0e18a2ada57f98c3b10fab0c13fb2d504ae1'/>
<id>urn:sha1:fb3f0e18a2ada57f98c3b10fab0c13fb2d504ae1</id>
<content type='text'>
* Replace boost::function usage with std::function for easier debugging and reduced compiler warnings
* Remove a few remaining instances of boost::noncopyable that were missed in tests

Signed-off-by: Rye &lt;rye@alchemyviewer.org&gt;</content>
</entry>
<entry>
<title>#5026 Upload To Folder feature not working</title>
<updated>2025-11-21T12:14:45Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>117672381+akleshchev@users.noreply.github.com</email>
</author>
<published>2025-11-21T03:31:30Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=7b2c3f7a22b0df319348224072b14448b1d0f54b'/>
<id>urn:sha1:7b2c3f7a22b0df319348224072b14448b1d0f54b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac</title>
<updated>2025-08-20T22:04:55Z</updated>
<author>
<name>Rye</name>
<email>rye@alchemyviewer.org</email>
</author>
<published>2025-08-20T22:04:55Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=ba30737d8f4add8ddd8c77d18df6497b46583fe9'/>
<id>urn:sha1:ba30737d8f4add8ddd8c77d18df6497b46583fe9</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch develop into 2025.06</title>
<updated>2025-08-06T13:05:19Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2025-08-06T13:05:19Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=ce9d66cdd18c58c3b26fbebde633ae00732d7f9f'/>
<id>urn:sha1:ce9d66cdd18c58c3b26fbebde633ae00732d7f9f</id>
<content type='text'>
# Conflicts:
#	indra/newview/llvoavatar.cpp
</content>
</entry>
<entry>
<title>#4318 Warn or log when texture gets scaled down</title>
<updated>2025-07-22T16:16:26Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2025-07-21T22:54:33Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=d84897967e836cd2dadf8f609eb98946f500d5b1'/>
<id>urn:sha1:d84897967e836cd2dadf8f609eb98946f500d5b1</id>
<content type='text'>
for material and model upload
</content>
</entry>
<entry>
<title>#4313 Improved naming of textures</title>
<updated>2025-07-02T16:31:26Z</updated>
<author>
<name>Maxim Nikolenko</name>
<email>maximnproductengine@lindenlab.com</email>
</author>
<published>2025-07-02T16:31:26Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=55a79ec56ba955955736b9ffa2e7d470712f871b'/>
<id>urn:sha1:55a79ec56ba955955736b9ffa2e7d470712f871b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>#4118 Allow Bulk Upload to initialize on Bulk Upload All option</title>
<updated>2025-05-22T11:58:13Z</updated>
<author>
<name>Maxim Nikolenko</name>
<email>maximnproductengine@lindenlab.com</email>
</author>
<published>2025-05-22T11:58:13Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=9d3a03e6da9604dc3d76ed0649c06c58beb22771'/>
<id>urn:sha1:9d3a03e6da9604dc3d76ed0649c06c58beb22771</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'release/2025.04' into rye/forevermac</title>
<updated>2025-04-15T17:55:01Z</updated>
<author>
<name>Jonathan "Geenz" Goodman</name>
<email>geenz@geenzo.com</email>
</author>
<published>2025-04-15T17:55:01Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=52cca995ccc30ac5aa989588a71c0a7f4a9804ae'/>
<id>urn:sha1:52cca995ccc30ac5aa989588a71c0a7f4a9804ae</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'main' into marchcat/maint-c-restore</title>
<updated>2025-04-15T16:31:20Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2025-04-15T16:31:20Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=ae931987356a71dbe8fc7ec31f2a2fe9108b4495'/>
<id>urn:sha1:ae931987356a71dbe8fc7ec31f2a2fe9108b4495</id>
<content type='text'>
# Conflicts:
#	indra/llcommon/lldate.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llmaterialeditor.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llvoavatar.cpp
</content>
</entry>
<entry>
<title>Merge commit '9e24b30' into marchcat/maint-c/restore</title>
<updated>2025-04-10T03:01:50Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2025-04-10T03:01:50Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=5d7a5001b41df8989cd493433c3dc45459db8240'/>
<id>urn:sha1:5d7a5001b41df8989cd493433c3dc45459db8240</id>
<content type='text'>
# Conflicts:
#	indra/llmath/v2math.cpp
#	indra/llmath/v2math.h
#	indra/llmath/v3math.h
#	indra/llmath/v4math.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/llui/llfolderviewmodel.h
#	indra/llui/llmodaldialog.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltexteditor.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llagentcamera.h
#	indra/newview/llavatarrenderinfoaccountant.cpp
#	indra/newview/llconversationmodel.h
#	indra/newview/llfloaterinventorysettings.cpp
#	indra/newview/llfloaternamedesc.cpp
#	indra/newview/llfloaternamedesc.h
#	indra/newview/llfloaterobjectweights.cpp
#	indra/newview/llfloaterobjectweights.h
#	indra/newview/llfolderviewmodelinventory.h
#	indra/newview/llinspecttexture.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorygallery.h
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmaterialeditor.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/llpanelgroupcreate.cpp
#	indra/newview/llpanelgroupgeneral.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llreflectionmap.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llteleporthistorystorage.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltexturefetch.cpp
#	indra/newview/lltexturefetch.h
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewercamera.cpp
#	indra/newview/llviewercamera.h
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvovolume.h
#	indra/newview/tests/llviewerassetstats_test.cpp
</content>
</entry>
</feed>
