<feed xmlns='http://www.w3.org/2005/Atom'>
<title>viewer.git/indra/newview/llselectmgr.h, branch cef_147</title>
<subtitle>Megapahit's fork of the Second Life viewer.
</subtitle>
<id>https://megapahit.org/viewer.git/atom?h=cef_147</id>
<link rel='self' href='https://megapahit.org/viewer.git/atom?h=cef_147'/>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/'/>
<updated>2025-05-29T04:35:27Z</updated>
<entry>
<title>Merge branch 'main' into 2025.05</title>
<updated>2025-05-29T04:35:27Z</updated>
<author>
<name>Erik Kundiman</name>
<email>erik@megapahit.org</email>
</author>
<published>2025-05-29T04:35:27Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=d046d7e0e1e3ccbffb42d22fe52aa73d0c170b8e'/>
<id>urn:sha1:d046d7e0e1e3ccbffb42d22fe52aa73d0c170b8e</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://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://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 branch 'release/2025.03' into release/2025.04</title>
<updated>2025-04-01T17:10:33Z</updated>
<author>
<name>Jonathan "Geenz" Goodman</name>
<email>geenz@geenzo.com</email>
</author>
<published>2025-04-01T17:10:33Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=ccdcbfeebd10a78cfb67f5324a3eb17a7d76604b'/>
<id>urn:sha1:ccdcbfeebd10a78cfb67f5324a3eb17a7d76604b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>#3780 disable water exclusion if user applies PBR or Media</title>
<updated>2025-03-24T16:05:06Z</updated>
<author>
<name>Maxim Nikolenko</name>
<email>maximnproductengine@lindenlab.com</email>
</author>
<published>2025-03-24T16:05:06Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=6b88a2bec27e24debb4eb4fe986850f36f8689a9'/>
<id>urn:sha1:6b88a2bec27e24debb4eb4fe986850f36f8689a9</id>
<content type='text'>
</content>
</entry>
<entry>
<title>viewer#2894 Make PBR scale like Blinn Phong does</title>
<updated>2025-03-19T19:55:01Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2024-10-28T22:54:13Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=bf0767b0d781202064c58ff7c9f44dfeec6959ac'/>
<id>urn:sha1:bf0767b0d781202064c58ff7c9f44dfeec6959ac</id>
<content type='text'>
</content>
</entry>
<entry>
<title>#3190 Ensure materials are properly copied instead of reused.</title>
<updated>2024-12-04T17:03:28Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2024-12-04T00:29:43Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=27fb297b6f5ac1e5b5e28c012a63f845eb81ab68'/>
<id>urn:sha1:27fb297b6f5ac1e5b5e28c012a63f845eb81ab68</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop</title>
<updated>2024-08-09T22:43:06Z</updated>
<author>
<name>Brad Linden</name>
<email>brad@lindenlab.com</email>
</author>
<published>2024-08-09T22:43:06Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=c106221726c48a4231b7854bff224ae422c0517f'/>
<id>urn:sha1:c106221726c48a4231b7854bff224ae422c0517f</id>
<content type='text'>
 # Conflicts:
 #	.github/workflows/build.yaml
 #	indra/llui/llscrolllistctrl.cpp
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus</title>
<updated>2024-08-09T22:10:13Z</updated>
<author>
<name>Brad Linden</name>
<email>brad@lindenlab.com</email>
</author>
<published>2024-08-09T22:10:13Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=3b2c32fdf940b37108e13eb69fcf0468469dc182'/>
<id>urn:sha1:3b2c32fdf940b37108e13eb69fcf0468469dc182</id>
<content type='text'>
 # Conflicts:
 #	.github/workflows/build.yaml
 #	indra/newview/CMakeLists.txt
 #	indra/newview/llspeakers.cpp
 #	indra/newview/llvoicechannel.cpp
 #	indra/newview/llvoicechannel.h
 #	indra/newview/llvoiceclient.cpp
 #	indra/newview/llvoiceclient.h
 #	indra/newview/llvoicewebrtc.cpp
</content>
</entry>
<entry>
<title>Replace boost::shared_ptr with std in voice classes</title>
<updated>2024-08-07T11:19:49Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2024-08-07T06:28:06Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=ae7f7cd6701ae9fed57c687b03aabad0d954b230'/>
<id>urn:sha1:ae7f7cd6701ae9fed57c687b03aabad0d954b230</id>
<content type='text'>
</content>
</entry>
</feed>
