| Age | Commit message (Collapse) | Author |
|---|
|
|
|
# Conflicts:
# indra/newview/llvoavatar.cpp
|
|
|
|
|
|
|
|
|
|
reduce build time
|
|
|
|
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit aaa8cb5a37a720ff67792d0a31fec793b03b3742.
|
|
This reverts commit 60592ae0d7a98e071e516fcac70c5bf1427f20be.
|
|
2024.09-ExtraFPS
|
|
LLFolderViewItem::drawFavoriteIcon (#2867)
|
|
|
|
* 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 & newview/llpanelwearing.cpp
* Restore changes from f660f1f0fda4d2363d351fa550b4f8818b46c2c3 in newview/llviewertexture.cpp
* Restore changes from b9633c17e373bfe55b29228996e8473eb041466d & 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
|
|
indicate if the world map should be opened and focused.
|
|
# Conflicts:
# autobuild.xml
# indra/llui/llmodaldialog.cpp
# indra/newview/llfloatermyenvironment.cpp
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/tests/llviewerassetstats_test.cpp
|
|
# Conflicts:
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
|
|
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/llui/llfolderviewmodel.h
# indra/newview/llconversationmodel.h
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llfolderviewmodelinventory.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorygallery.h
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llwearableitemslist.cpp
|
|
# Conflicts:
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/newview/llappviewer.cpp
# indra/newview/llconversationlog.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimview.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llviewerjoystick.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
|
|
|
|
|
|
# Conflicts:
# .github/workflows/build.yaml
# indra/llmath/raytrace.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pasteTextWithLinebreaks (#2729)
GCC 13 did not like having a template<> inside the class body at all.
Thus turn the specialization of pasteTextWithLinebreaks into a
class methode pasteTextWithLinebreaksImpl.
|
|
This allows removing #include "llerror.h" from llpointer.h.
Also remove #include "llmutex.h" as a heavy way to get
<boost/functional/hash.hpp>.
That requires adding #include "llmutex.h" to llimage.h, llnotifications.h,
llwatchdog.cpp and llvolumemgr.cpp, which were inheriting it from llpointer.h.
|
|
|
|
|
|
In C++20, `std::filesystem::u8path()` (that accepts a UTF-8 encoded
`std::string` and returns a `std::filesystem::path`) is deprecated. Instead,
to engage UTF-8 coding conversions, we're supposed to pass the `path`
constructor a `std::u8string`, i.e. a `std::basic_string<char8_t>`. Since
`char8_t` is a type distinct from both `char` and `unsigned char`, we must Do
Something to pass a UTF-8 encoded `std::string` into `std::filesystem::path`.
To avoid copying characters from a `std::string` into a temporary
`std::u8string` and from there into the `std::filesystem::path`, make a
`boost::transform_iterator` that accepts a `std::string_view::iterator` and
adapts it to dereference `char8_t` characters. Make `fsyspath(std::string_view)`
engage the base-class constructor accepting (iterator, iterator), adapting
`string_view::begin()` and `end()` to deliver `char8_t` characters.
Use the same tactic for `fsyspath::operator=(std::string_view)`, explicitly
calling `std::filesystem::path::assign()` with the adapted iterators.
To resolve ambiguities, provide both constructors and assignment operators
accepting `(const std::string&)` and `(const char*)`, explicitly converting
each to `std::string_view`.
At the same time, `std::filesystem::path::u8string()` now returns
`std::u8string` rather than `std::string`. Since `std::filesystem::path`
delivers only that `std::u8string` rather than iterators into its internal
representation, we can't avoid capturing it and copying to the returned
`std::string`.
Remove explicit `.u8string()` calls from a few existing `fsyspath` instances,
now that `fsyspath` supports implicit conversion to `std::string`.
|
|
asStringRef is only valid for strings
|
|
history with Ctrl-PgUp/PgDown (#2680)
|
|
|
