History

hook up can-rez-tmp and can-write-to-asset-server

Seth Alves committed 10 years ago

Commit b2f63a21 parent 3bfcc8611 files · +74 −26Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -4279,7 +4279,7 @@ void Application::nodeActivated(SharedNodePointer node) { · 4278 unmodified lines
4279 if (assetDialog) {4279 if (assetDialog) {
4280 auto nodeList = DependencyManager::get<NodeList>();4280 auto nodeList = DependencyManager::get<NodeList>();
4281 4281
4282 if (nodeList->getThisNodeCanRez()) {4282 if (nodeList->getThisNodeCanWriteAssets()) {
4283 // call reload on the shown asset browser dialog to get the mappings (if permissions allow)4283 // call reload on the shown asset browser dialog to get the mappings (if permissions allow)
4284 QMetaObject::invokeMethod(assetDialog, "reload");4284 QMetaObject::invokeMethod(assetDialog, "reload");
4285 } else {4285 } else {
@@ -4786,7 +4786,7 @@ void Application::toggleRunningScriptsWidget() const { · 500 unmodified lines
4786}4786}
4787 4787
4788void Application::toggleAssetServerWidget(QString filePath) {4788void Application::toggleAssetServerWidget(QString filePath) {
4789 if (!DependencyManager::get<NodeList>()->getThisNodeCanRez()) {4789 if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
4790 return;4790 return;
4791 }4791 }
4792 4792