Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
in Gallery
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/llfloateravatarrendersettings.cpp
|
|
|
|
'paste as link'
|
|
for links
|
|
|
|
|
|
|
|
|
|
This reverts part of commit 0c2b00efaa2b01204618f4950e5d945331a52f0d.
|
|
|
|
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
|
|
|
|
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
|
|
following promotion of DRTVWR-573
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Try getting lost and found
|
|
|
|
And signal fodler fetch completion when folder of recursive fetch is done, do not hold it for individual items
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|