From 9539292c223987654a34594c17755e2664609c49 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 6 Feb 2015 10:44:35 -0800 Subject: [PATCH] clarify settings explaination, coding standard --- domain-server/resources/describe-settings.json | 2 +- libraries/entities/src/EntityTree.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 31635e40d3..83b270c772 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -78,7 +78,7 @@ "name": "allowed_editors", "type": "table", "label": "Allowed Editors", - "help": "List the High Fidelity names for people you want to be able to make changes to this domain.
An empty list means everyone.", + "help": "List the High Fidelity names for people you want to be able lock or unlock entities in this domain.
An empty list means everyone.", "numbered": false, "columns": [ { diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h index 62d6db0a10..3bc0986799 100644 --- a/libraries/entities/src/EntityTree.h +++ b/libraries/entities/src/EntityTree.h @@ -162,7 +162,7 @@ private: void processRemovedEntities(const DeleteEntityOperator& theOperator); bool updateEntityWithElement(EntityItem* entity, const EntityItemProperties& properties, - EntityTreeElement* containingElement, bool AllowLockChange); + EntityTreeElement* containingElement, bool allowLockChange); static bool findNearPointOperation(OctreeElement* element, void* extraData); static bool findInSphereOperation(OctreeElement* element, void* extraData); static bool findInCubeOperation(OctreeElement* element, void* extraData);