Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
|
|
|
|
|
|
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
|
|
folders to open and shift out of view
|
|
|
|
|
|
Tools/Content tab
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures
|
|
|
|
|
|
|
|
This reverts commit a66932a091bac4d4ca1a861901b9cef619a406f7.
|
|
buildConversationViewParticipant() was deparenting view models that belong to session
|
|
# Conflicts:
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.cpp
# indra/newview/llenvironment.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
content
|
|
|
|
|
|
an open folder into another folder
|
|
|
|
|
|
|
|
not worn items are selected
|
|
|
|
|
|
|
|
(long long round) in VS2013
|
|
|
|
|
|
to inventory tab and folder view folders so that case can be taken into account.
|
|
hides THAT folder
fixed issue with 'yet to be started filter' and 'dirty-visible' item.
|
|
reverted and remade MAINT-4218
|
|
methods on bridge items to know if items are wearable or not.
|
|
and hides THAT folder
|
|
|
|
getting listings several times
|