Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
|
|
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
|
|
|
|
selected
|
|
|
|
|
|
|
|
|
|
The 'exceptions' solution is a bit ugly, but alternative is remaking all inventory and chat menus to act based on registars
|
|
|
|
|
|
# Conflicts:
# doc/contributions.txt
|
|
|
|
|
|
|
|
delete the unlisted listing folder
|
|
|
|
# Conflicts:
# indra/newview/llappviewer.cpp
|
|
|
|
Inventory floater and reset the filters to guarantee success
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
|
|
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
|
|
original" result
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
unlists listings
|
|
|
|
|
|
content
|
|
|
|
|
|
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path
* Closing new inventory windows don't release memory
* During shutdown legacy and inoperable code for inventory window cleanup is called
* Remove old and unused inventory legacy code
|
|
|
|
fetched causes listings to be unlisted.
|
|
|
|
|
|
|
|
|
|
KEYDOWN to the CEF plugin.
|