Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 07:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Turn Commerce on by default

Browse source
This commit is contained in:
Zach Fox 2017-11-17 15:12:49 -08:00
parent 24e0d5ba67
commit f47f259816
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -203,7 +203,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& entityItemID) { bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& entityItemID) {
EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags); EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags);
Setting::Handle<bool> _settingSwitch{ "commerce", false }; Setting::Handle<bool> _settingSwitch{ "commerce", true };
if (_settingSwitch.get()) { if (_settingSwitch.get()) {
return (entityProperties.getCertificateID().length() != 0); return (entityProperties.getCertificateID().length() != 0);
} else { } else {
@ -233,7 +233,7 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) { void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
if (overlayID == _contextOverlayID && event.getButton() == PointerEvent::PrimaryButton) { if (overlayID == _contextOverlayID && event.getButton() == PointerEvent::PrimaryButton) {
qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID; qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID;
Setting::Handle<bool> _settingSwitch{ "commerce", false }; Setting::Handle<bool> _settingSwitch{ "commerce", true };
if (_settingSwitch.get()) { if (_settingSwitch.get()) {
openInspectionCertificate(); openInspectionCertificate();
} else { } else {

2
libraries/ui/src/ui/types/RequestFilters.cpp
View file

@ -62,7 +62,7 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info)
// During the period in which we have HFC commerce in the system, but not applied everywhere: // During the period in which we have HFC commerce in the system, but not applied everywhere:
const QString tokenStringCommerce{ "Chrome/48.0 (HighFidelityInterface WithHFC)" }; const QString tokenStringCommerce{ "Chrome/48.0 (HighFidelityInterface WithHFC)" };
Setting::Handle<bool> _settingSwitch{ "commerce", false }; Setting::Handle<bool> _settingSwitch{ "commerce", true };
bool isMoney = _settingSwitch.get(); bool isMoney = _settingSwitch.get();
const QString tokenString = !isAuthable ? tokenStringMobile : (isMoney ? tokenStringCommerce : tokenStringMetaverse); const QString tokenString = !isAuthable ? tokenStringMobile : (isMoney ? tokenStringCommerce : tokenStringMetaverse);

2
scripts/system/commerce/wallet.js
View file

@ -145,7 +145,7 @@
var button; var button;
var buttonName = "WALLET"; var buttonName = "WALLET";
var tablet = null; var tablet = null;
var walletEnabled = Settings.getValue("commerce", false); var walletEnabled = Settings.getValue("commerce", true);
function startup() { function startup() {
if (walletEnabled) { if (walletEnabled) {
tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

2
scripts/system/marketplaces/marketplaces.js
View file

@ -160,7 +160,7 @@
type: "marketplaces", type: "marketplaces",
action: "commerceSetting", action: "commerceSetting",
data: { data: {
commerceMode: Settings.getValue("commerce", false), commerceMode: Settings.getValue("commerce", true),
userIsLoggedIn: Account.loggedIn, userIsLoggedIn: Account.loggedIn,
walletNeedsSetup: Wallet.walletStatus === 1, walletNeedsSetup: Wallet.walletStatus === 1,
metaverseServerURL: Account.metaverseServerURL metaverseServerURL: Account.metaverseServerURL