merge

indra/llinventory/lleconomy.cpp

indra/llinventory/lleconomy.h

indra/newview/llassetuploadresponders.cpp

indra/newview/llfloatersnapshot.cpp

indra/newview/llfloatersnapshot.h

indra/newview/llpanelsnapshot.cpp

indra/newview/llpanelsnapshot.h

indra/newview/llpanelsnapshotinventory.cpp

indra/newview/llpanelsnapshotlocal.cpp

indra/newview/llpanelsnapshotoptions.cpp

indra/newview/skins/default/xui/en/floater_snapshot.xml

...a/newview/skins/default/xui/en/panel_postcard_message.xml

...newview/skins/default/xui/en/panel_snapshot_inventory.xml

indra/newview/skins/default/xui/en/panel_snapshot_local.xml

...a/newview/skins/default/xui/en/panel_snapshot_options.xml

...a/newview/skins/default/xui/en/panel_snapshot_profile.xml