Small edit.js changes

This commit is contained in:
Zach Fox 2017-10-26 16:44:21 -07:00
parent 2f28cf1443
commit 8cb60fc62c

View file

@ -415,7 +415,7 @@ var toolBar = (function () {
} }
}); });
var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp()); var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON); var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON);
tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
activeButton = tablet.addButton({ activeButton = tablet.addButton({
@ -434,7 +434,7 @@ var toolBar = (function () {
tablet.fromQml.connect(fromQml); tablet.fromQml.connect(fromQml);
createButton.clicked.connect(function() { createButton.clicked.connect(function() {
if ( ! (Entities.canRez() || Entities.canRezTmp()) ) { if ( ! (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified()) ) {
Window.notifyEditError(INSUFFICIENT_PERMISSIONS_ERROR_MSG); Window.notifyEditError(INSUFFICIENT_PERMISSIONS_ERROR_MSG);
return; return;
} }
@ -634,7 +634,7 @@ var toolBar = (function () {
if (active === isActive) { if (active === isActive) {
return; return;
} }
if (active && !Entities.canRez() && !Entities.canRezTmp()) { if (active && !Entities.canRez() && !Entities.canRezTmp() && !Entities.canRezCertified() && !Entities.canRezTmpCertified()) {
Window.notifyEditError(INSUFFICIENT_PERMISSIONS_ERROR_MSG); Window.notifyEditError(INSUFFICIENT_PERMISSIONS_ERROR_MSG);
return; return;
} }
@ -789,7 +789,7 @@ function handleDomainChange() {
return; return;
} }
var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp()); var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
createButton.editProperties({ createButton.editProperties({
icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON), icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON),
captionColorOverride: (hasRezPermissions ? "" : "#888888"), captionColorOverride: (hasRezPermissions ? "" : "#888888"),
@ -1491,7 +1491,7 @@ function onFileOpenChanged(filename) {
} }
} }
if (importURL) { if (importURL) {
if (!isActive && (Entities.canRez() && Entities.canRezTmp())) { if (!isActive && (Entities.canRez() && Entities.canRezTmp() && Entities.canRezCertified() && Entities.canRezTmpCertified())) {
toolBar.toggle(); toolBar.toggle();
} }
importSVO(importURL); importSVO(importURL);
@ -1501,7 +1501,7 @@ function onFileOpenChanged(filename) {
function onPromptTextChanged(prompt) { function onPromptTextChanged(prompt) {
Window.promptTextChanged.disconnect(onPromptTextChanged); Window.promptTextChanged.disconnect(onPromptTextChanged);
if (prompt !== "") { if (prompt !== "") {
if (!isActive && (Entities.canRez() && Entities.canRezTmp())) { if (!isActive && (Entities.canRez() && Entities.canRezTmp() && Entities.canRezCertified() && Entities.canRezTmpCertified())) {
toolBar.toggle(); toolBar.toggle();
} }
importSVO(prompt); importSVO(prompt);