History

allow setting of avatar URLs via AvatarData properties

Stephen Birarda committed 12 years ago

Commit f10404b1 parent e72f6d15 files · +2 −53Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.h (1 of 5 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.h+0−5
@@ -24,7 +24,6 @@ · 23 unmodified lines
24class ParticlesScriptingInterface;24class ParticlesScriptingInterface;
25 25
26#include "AbstractControllerScriptingInterface.h"26#include "AbstractControllerScriptingInterface.h"
27#include "DataServerScriptingInterface.h"
28#include "Quat.h"27#include "Quat.h"
29 28
30const QString NO_SCRIPT("");29const QString NO_SCRIPT("");
@@ -43,9 +42,6 @@ public: · 12 unmodified lines
43 42
44 /// Access the ParticlesScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener43 /// Access the ParticlesScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener
45 static ParticlesScriptingInterface* getParticlesScriptingInterface() { return &_particlesScriptingInterface; }44 static ParticlesScriptingInterface* getParticlesScriptingInterface() { return &_particlesScriptingInterface; }
46
47 /// Access the DataServerScriptingInterface for access to its underlying UUID
48 const DataServerScriptingInterface& getDataServerScriptingInterface() { return _dataServerScriptingInterface; }
49 45
50 /// sets the script contents, will return false if failed, will fail if script is already running46 /// sets the script contents, will return false if failed, will fail if script is already running
51 bool setScriptContents(const QString& scriptContents);47 bool setScriptContents(const QString& scriptContents);
@@ -97,7 +93,6 @@ private: · 45 unmodified lines
97 static ParticlesScriptingInterface _particlesScriptingInterface;93 static ParticlesScriptingInterface _particlesScriptingInterface;
98 AbstractControllerScriptingInterface* _controllerScriptingInterface;94 AbstractControllerScriptingInterface* _controllerScriptingInterface;
99 AudioScriptingInterface _audioScriptingInterface;95 AudioScriptingInterface _audioScriptingInterface;
100 DataServerScriptingInterface _dataServerScriptingInterface;
101 AvatarData* _avatarData;96 AvatarData* _avatarData;
102 bool _wantMenuItems;97 bool _wantMenuItems;
103 QString _scriptMenuName;98 QString _scriptMenuName;