Skip to content

Commit bfbbb2f

Browse files
authored
Merge pull request vircadia#1444 from AleziaKurdis/CreateApp-ServerAndClientScriptIndicator
Create app: Script indicator toggles for both entity client & server scripts.
2 parents 60c63c1 + e109b20 commit bfbbb2f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/system/create/entityList/entityList.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ EntityListTool = function(shouldUseEditTabletApp) {
203203
var cameraPosition = Camera.position;
204204
PROFILE("getMultipleProperties", function () {
205205
var multipleProperties = Entities.getMultipleEntityProperties(ids, ['position', 'name', 'type', 'locked',
206-
'visible', 'renderInfo', 'modelURL', 'materialURL', 'imageURL', 'script', 'certificateID',
207-
'skybox.url', 'ambientLight.url', 'created', 'lastEdited']);
206+
'visible', 'renderInfo', 'modelURL', 'materialURL', 'imageURL', 'script', 'serverScripts',
207+
'certificateID', 'skybox.url', 'ambientLight.url', 'created', 'lastEdited']);
208208
for (var i = 0; i < multipleProperties.length; i++) {
209209
var properties = multipleProperties[i];
210210

@@ -247,7 +247,7 @@ EntityListTool = function(shouldUseEditTabletApp) {
247247
isBaked: entityIsBaked(properties),
248248
drawCalls: (properties.renderInfo !== undefined ?
249249
valueIfDefined(properties.renderInfo.drawCalls) : ""),
250-
hasScript: properties.script !== "",
250+
hasScript: (properties.script !== "" || properties.serverScripts !== ""),
251251
parentState: parentState,
252252
created: formatToStringDateTime(properties.created),
253253
lastEdited: formatToStringDateTime(properties.lastEdited)

0 commit comments

Comments
 (0)