Age | Commit message (Collapse) | Author |
|
# 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
|
|
|
|
findCategory and move_item_to_marketplacelistings
|
|
|
|
DRTVWR-568_cmake
|
|
|
|
|
|
1. Do not process all marketpalce changes at once, schedule them for later
2. Do not notifyObservers from notifyObservers
|
|
"features.h"
which has the same name as a glibc header, allowing this header to be found without any prefix
will lead to head conflicts when there is a '#include "features.h"'
As a result all json headers need to be included via #include "json/reader.h"/"json/writer.h"
|
|
|
|
Log issue and try to recover
|
|
|
|
|
|
|
|
|
|
that it will only happen after the region caps have been received.
|
|
|
|
|
|
and teleport
|
|
|
|
correctly returning error body to application.
LLCore:HTTP now will provide and LLSD translation of the message body when possible in the case of an error HTTP result
VMM alert boxes now use type="alertmodal" rather than "outbox"
|
|
|
|
|
|
|
|
LLSD and remove unused logging function.
|
|
MAINT-4952: Coverted VMM to coroutines
|
|
|
|
|
|
|
|
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
|
|
before we get data from SLM
|
|
some functions avoiding depth computation when we could, fixed cut case
|
|
to listing folder to improve performance
|
|
A couple of minor changes to merchant out box in hopes that the would fix the issues.
|
|
redirection.
|
|
|
|
delete it from the local store
|
|
|
|
throughout marketplace handling
|
|
update_marketplace_category() that are picked by dirty bit setup
|
|
|
|
Update count on hand in reassociate correctly.
|
|
|
|
|
|
data and inventory data are being fetched
|
|
error occured on SLM
|
|
folder policy apply, prompt user only if it doesn't
|
|
confirmation from the server
|
|
error dialog
|
|
activate or have another message
|