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:
# doc/contributions.txt
|
|
|
|
|
|
delete the unlisted listing folder
|
|
|
|
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
links to it in the menus. Also removed the Outbox Floater and made the folder always hidden if empty in inventory.
(There may still be some outstanding Outbox code that was not obvious that I have missed.)
|
|
|
|
|
|
|
|
|
|
|
|
modal from a non existant object.
|
|
modal from a non existant object.
|
|
throughout marketplace handling
|
|
|
|
folder to the marketplace
|
|
of validate_marketplaceting(). Open marketplace floater on copy or move. String fix.
|
|
message when no error, disable some right click menu items in multiselection cases
|
|
legit. Also takes into account moving within the same version folder when moving items
|
|
the same messages. Needs validation by producer.
|
|
|
|
user with relevant error when that happens.
|
|
on selected items
|
|
|
|
when listing will unlist. Make update skip consistency check when called from internal level (not public API).
|
|
|
|
|