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

back out bad change

Browse source
This commit is contained in:
Seth Alves 2017-09-21 11:39:14 -07:00
parent 24bfb3f3b9
commit 3c22c9ea3a
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/system/controllers/controllerDispatcher.js
View file

@ -299,6 +299,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
// activity-slots which this plugin consumes as "in use" // activity-slots which this plugin consumes as "in use"
_this.runningPluginNames[orderedPluginName] = true; _this.runningPluginNames[orderedPluginName] = true;
_this.markSlots(candidatePlugin, orderedPluginName); _this.markSlots(candidatePlugin, orderedPluginName);
print("QQQQ running " + orderedPluginName);
} }
if (PROFILE) { if (PROFILE) {
Script.endProfileRange("dispatch.isReady." + orderedPluginName); Script.endProfileRange("dispatch.isReady." + orderedPluginName);
@ -331,6 +332,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
// of running plugins and mark its activity-slots as "not in use" // of running plugins and mark its activity-slots as "not in use"
delete _this.runningPluginNames[runningPluginName]; delete _this.runningPluginNames[runningPluginName];
_this.markSlots(plugin, false); _this.markSlots(plugin, false);
print("QQQQ stopping " + runningPluginName);
} }
if (PROFILE) { if (PROFILE) {
Script.endProfileRange("dispatch.run." + runningPluginName); Script.endProfileRange("dispatch.run." + runningPluginName);

2
scripts/system/controllers/controllerModules/nearParentGrabEntity.js
View file

@ -300,7 +300,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
if (targetCloneable) { if (targetCloneable) {
var worldEntityProps = controllerData.nearbyEntityProperties[this.hand]; var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];
var cloneID = cloneEntity(targetProps, worldEntityProps); var cloneID = cloneEntity(targetProps, worldEntityProps);
var cloneProps = controllerData.nearbyEntityPropertiesByID[cloneID]; var cloneProps = Entities.getEntityProperties(cloneID);
this.grabbing = true; this.grabbing = true;
this.targetEntityID = cloneID; this.targetEntityID = cloneID;
this.startNearParentingGrabEntity(controllerData, cloneProps); this.startNearParentingGrabEntity(controllerData, cloneProps);