Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 11 files). Show all
Unified · Split
| @@ -71,14 +71,14 @@ ScriptEngine::~ScriptEngine() { · 70 unmodified lines | |||
| 71 | //printf("ScriptEngine::~ScriptEngine()...\n"); | 71 | //printf("ScriptEngine::~ScriptEngine()...\n"); |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | void ScriptEngine::setAvatarData(AvatarData* avatarData) { | 74 | void ScriptEngine::setAvatarData(AvatarData* avatarData, const QString& objectName) { |
| 75 | _avatarData = avatarData; | 75 | _avatarData = avatarData; |
| 76 | 76 | ||
| 77 | // remove the old Avatar property, if it exists | 77 | // remove the old Avatar property, if it exists |
| 78 | _engine.globalObject().setProperty("Avatar", QScriptValue()); | 78 | _engine.globalObject().setProperty(objectName, QScriptValue()); |
| 79 | 79 | ||
| 80 | // give the script engine the new Avatar script property | 80 | // give the script engine the new Avatar script property |
| 81 | registerGlobalObject("Avatar", _avatarData); | 81 | registerGlobalObject(objectName, _avatarData); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | void ScriptEngine::setupMenuItems() { | 84 | void ScriptEngine::setupMenuItems() { |