Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 09:20:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

restore original files that had erroneous whitespace changes to reduce diff

Browse source
This commit is contained in:
Liv 2017-07-26 09:00:51 -07:00
parent 57b27a7bb7
commit eb1b7e52df
5 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
domain-server/src/DomainServer.cpp
View file

@ -160,9 +160,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
getTemporaryName(); getTemporaryName();
} }
_gatekeeper.preloadAllowedUserPublicKeys(); // so they can connect on first request // send signal to DomainMetadata when descriptors changed
//send signal to DomainMetadata when descriptors changed
_metadata = new DomainMetadata(this); _metadata = new DomainMetadata(this);
connect(&_settingsManager, &DomainServerSettingsManager::settingsUpdated, connect(&_settingsManager, &DomainServerSettingsManager::settingsUpdated,
_metadata, &DomainMetadata::descriptorsChanged); _metadata, &DomainMetadata::descriptorsChanged);
@ -2850,4 +2848,4 @@ void DomainServer::handleOctreeFileReplacement(QByteArray octreeFile) {
limitedNodeList->sendPacketList(std::move(octreeFilePacketList), *octreeNode); limitedNodeList->sendPacketList(std::move(octreeFilePacketList), *octreeNode);
}); });
} }

1
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -1164,6 +1164,7 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID,
return doTransmit; return doTransmit;
} }
QUuid EntityScriptingInterface::addAction(const QString& actionTypeString, QUuid EntityScriptingInterface::addAction(const QString& actionTypeString,
const QUuid& entityID, const QUuid& entityID,
const QVariantMap& arguments) { const QVariantMap& arguments) {

1
libraries/entities/src/EntityScriptingInterface.h
View file

@ -359,7 +359,6 @@ public slots:
*/ */
Q_INVOKABLE glm::mat4 getEntityLocalTransform(const QUuid& entityID); Q_INVOKABLE glm::mat4 getEntityLocalTransform(const QUuid& entityID);
signals: signals:
void collisionWithEntity(const EntityItemID& idA, const EntityItemID& idB, const Collision& collision); void collisionWithEntity(const EntityItemID& idA, const EntityItemID& idB, const Collision& collision);

1
libraries/script-engine/src/UsersScriptingInterface.cpp
View file

@ -93,4 +93,3 @@ bool UsersScriptingInterface::getRequestsDomainListData() {
void UsersScriptingInterface::setRequestsDomainListData(bool isRequesting) { void UsersScriptingInterface::setRequestsDomainListData(bool isRequesting) {
DependencyManager::get<NodeList>()->setRequestsDomainListData(isRequesting); DependencyManager::get<NodeList>()->setRequestsDomainListData(isRequesting);
} }

2
libraries/script-engine/src/UsersScriptingInterface.h
View file

@ -25,6 +25,7 @@ class UsersScriptingInterface : public QObject, public Dependency {
Q_PROPERTY(bool canKick READ getCanKick) Q_PROPERTY(bool canKick READ getCanKick)
Q_PROPERTY(bool requestsDomainListData READ getRequestsDomainListData WRITE setRequestsDomainListData) Q_PROPERTY(bool requestsDomainListData READ getRequestsDomainListData WRITE setRequestsDomainListData)
public: public:
UsersScriptingInterface(); UsersScriptingInterface();
@ -130,7 +131,6 @@ public slots:
*/ */
bool getIgnoreRadiusEnabled(); bool getIgnoreRadiusEnabled();
signals: signals:
void canKickChanged(bool canKick); void canKickChanged(bool canKick);
void ignoreRadiusEnabledChanged(bool isEnabled); void ignoreRadiusEnabledChanged(bool isEnabled);