<feed xmlns='http://www.w3.org/2005/Atom'>
<title>viewer.git/indra/llui/llflatlistview.h, branch 26.1.1</title>
<subtitle>Megapahit's fork of the Second Life viewer.
</subtitle>
<id>https://megapahit.org/viewer.git/atom?h=26.1.1</id>
<link rel='self' href='https://megapahit.org/viewer.git/atom?h=26.1.1'/>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/'/>
<updated>2025-11-27T14:58:32Z</updated>
<entry>
<title>#5046 Remove redundant updates in outfit list #1</title>
<updated>2025-11-27T14:58:32Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>117672381+akleshchev@users.noreply.github.com</email>
</author>
<published>2025-11-25T19:10:58Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=bc4492da8b4dd173356a7d68e85e14b2ca3fe9e6'/>
<id>urn:sha1:bc4492da8b4dd173356a7d68e85e14b2ca3fe9e6</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'main' into marchcat/2505-merge</title>
<updated>2025-05-28T18:38:00Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2025-05-28T18:38:00Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=b08ba3fa7bc9e6309891e510fbfb5c4e2b5c922e'/>
<id>urn:sha1:b08ba3fa7bc9e6309891e510fbfb5c4e2b5c922e</id>
<content type='text'>
# Conflicts:
#	.github/workflows/qatest.yaml
#	indra/llcommon/llsdutil.h
#	indra/llui/llflatlistview.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h
</content>
</entry>
<entry>
<title>Merge branch 'release/2025.04' into 2025.04-chat-mention</title>
<updated>2025-04-25T13:40:38Z</updated>
<author>
<name>Mnikolenko Productengine</name>
<email>mnikolenko@productengine.com</email>
</author>
<published>2025-04-25T13:40:38Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=a7759f370435bdd971724aa799160fa28ae112b5'/>
<id>urn:sha1:a7759f370435bdd971724aa799160fa28ae112b5</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Restore missing 'override'</title>
<updated>2025-04-18T17:36:28Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2025-04-18T15:43:46Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=4cccf8af43c8ebd9f947b9050a0403f65d0de7ee'/>
<id>urn:sha1:4cccf8af43c8ebd9f947b9050a0403f65d0de7ee</id>
<content type='text'>
</content>
</entry>
<entry>
<title>#3758 initial chat mention support</title>
<updated>2025-04-18T16:59:17Z</updated>
<author>
<name>Mnikolenko Productengine</name>
<email>mnikolenko@productengine.com</email>
</author>
<published>2025-04-18T14:48:02Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=3e46d707a243e91046b3ab0af8f844d7f40f77b4'/>
<id>urn:sha1:3e46d707a243e91046b3ab0af8f844d7f40f77b4</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Restore missing 'override'</title>
<updated>2025-04-18T16:24:15Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2025-04-18T15:43:46Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=1c3ce46d34293f0e1dc5887ef98b05921af663c9'/>
<id>urn:sha1:1c3ce46d34293f0e1dc5887ef98b05921af663c9</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'develop' into marchcat/05-develop</title>
<updated>2025-04-18T15:11:44Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2025-04-18T15:11:44Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=933f5226fec756016487f0cfdec0986f11d1eb87'/>
<id>urn:sha1:933f5226fec756016487f0cfdec0986f11d1eb87</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Clean up LLUI and fix/add suggestions from VS (#2746)</title>
<updated>2025-04-17T23:45:11Z</updated>
<author>
<name>Ansariel Hiller</name>
<email>Ansariel@users.noreply.github.com</email>
</author>
<published>2024-10-02T20:51:10Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=9c3ce3dec7ad01620213079204d0a43d193bbfb9'/>
<id>urn:sha1:9c3ce3dec7ad01620213079204d0a43d193bbfb9</id>
<content type='text'>
# Conflicts:
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.h
#	indra/llwindow/llwindowsdl.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://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>
<entry>
<title>Merge main into inventory_favorites</title>
<updated>2024-06-10T16:25:02Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2024-06-10T14:06:06Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=0dcc912cecdfb365c1f4246545ece40ccb7bc18e'/>
<id>urn:sha1:0dcc912cecdfb365c1f4246545ece40ccb7bc18e</id>
<content type='text'>
# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp
</content>
</entry>
</feed>
