<feed xmlns='http://www.w3.org/2005/Atom'>
<title>viewer.git/indra/newview/llfolderviewmodelinventory.cpp, 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-04-18T19:23:14Z</updated>
<entry>
<title>#3910 Fix sorting of 'favorites' inventory tab</title>
<updated>2025-04-18T19:23:14Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2025-04-18T18:16:26Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=f5be5493706368792191eb2f85c126072a8379d8'/>
<id>urn:sha1:f5be5493706368792191eb2f85c126072a8379d8</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fix merge issues:</title>
<updated>2025-04-10T20:51:36Z</updated>
<author>
<name>Ansariel</name>
<email>ansariel.hiller@phoenixviewer.com</email>
</author>
<published>2024-10-15T20:35:38Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=19347f7094c9448e02a021ae2d571b5fe8bfcc2e'/>
<id>urn:sha1:19347f7094c9448e02a021ae2d571b5fe8bfcc2e</id>
<content type='text'>
* Restore changes from 21947778baaca205615a71a97ac8f563c998fdd3 to llwindow/llwindowwin32.cpp
* Restore changes from 3758618949684641fc94b5c9478d9002706213cc to newview/llinspecttexture.cpp
* Fix apparent merge error in LLInventoryPanel::itemChanged
* Restore changes from 1eeecfa1a8bf43a8980217ce34e3b5f4458483e0 in newview/llpaneloutfitsinventory.h
* Restore changes from b9633c17e373bfe55b29228996e8473eb041466d in newview/llpaneloutfitsinventory.h &amp; newview/llpanelwearing.cpp
* Restore changes from f660f1f0fda4d2363d351fa550b4f8818b46c2c3 in newview/llviewertexture.cpp
* Restore changes from b9633c17e373bfe55b29228996e8473eb041466d &amp; 98f7d73d46fdc045759023eda6409e8c791f5cb2 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp
* Replace changes from 23729442aab7130f3368d433e8a5a9dd45ff6b98 with current implementation in develop branch
* Fix more broken changes in LLViewerTexture::saveRawImage
* Restore the changes in LLMath both from develop and maint-c
* Fix all kind of other merge errors

# Conflicts:
#	indra/llmath/v2math.h
#	indra/llmath/v3math.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llfloaterobjectweights.h
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llvoavatar.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>
<entry>
<title>viewer#1300 'Star' favorites in inventory #3</title>
<updated>2024-04-29T19:43:24Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2024-04-29T19:07:12Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=2add3b49537fb041b880752dc5302ac6b317e601'/>
<id>urn:sha1:2add3b49537fb041b880752dc5302ac6b317e601</id>
<content type='text'>
</content>
</entry>
<entry>
<title>#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed</title>
<updated>2024-04-29T04:56:09Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2024-04-29T04:43:28Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=1b68f71348ecf3983b76b40d7940da8377f049b7'/>
<id>urn:sha1:1b68f71348ecf3983b76b40d7940da8377f049b7</id>
<content type='text'>
</content>
</entry>
<entry>
<title>viewer#1300 'Star' favorites in inventory</title>
<updated>2024-04-26T21:39:50Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2024-04-25T01:46:42Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=cea6eeeede9f687ca195cc9b9e778fd6784afbe2'/>
<id>urn:sha1:cea6eeeede9f687ca195cc9b9e778fd6784afbe2</id>
<content type='text'>
image is WIP
</content>
</entry>
<entry>
<title>SL-18735 Using "Find original" in main inventory tab breaks inventory view</title>
<updated>2023-01-16T18:42:20Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2023-01-16T02:42:33Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=a1931d8cc4820eb4e20f1346fc7c3e0139c5863b'/>
<id>urn:sha1:a1931d8cc4820eb4e20f1346fc7c3e0139c5863b</id>
<content type='text'>
Fixes folders being invidible (missing arrange)
Fixes sroll to target not working reliably
</content>
</entry>
<entry>
<title>SL-13182 Fix excessive resorting #2</title>
<updated>2021-04-02T21:15:44Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2021-04-02T21:15:44Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=2be5baf70dcf4e55fcac3935e304828ced202123'/>
<id>urn:sha1:2be5baf70dcf4e55fcac3935e304828ced202123</id>
<content type='text'>
Don't resort whole branch of inventory if created(loaded) item is not newer. Should also stabilize fetch phase a bit.
</content>
</entry>
<entry>
<title>SL-13182 Fix excessive resorting</title>
<updated>2021-04-02T20:36:14Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2021-04-02T19:40:56Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=820ac72f8c4a07bc4310b9daac6966f2f2f2ee98'/>
<id>urn:sha1:820ac72f8c4a07bc4310b9daac6966f2f2f2ee98</id>
<content type='text'>
</content>
</entry>
<entry>
<title>SL-13182 Split buildNewViews over frames</title>
<updated>2021-04-01T20:06:44Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2021-03-23T23:53:45Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=7ddbf118f5d1fde24c10b93432209fbe44d91345'/>
<id>urn:sha1:7ddbf118f5d1fde24c10b93432209fbe44d91345</id>
<content type='text'>
</content>
</entry>
</feed>
