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

clarify settings explaination, coding standard

Browse source
This commit is contained in:
Seth Alves 2015-02-06 10:44:35 -08:00
parent 839b622a05
commit 9539292c22
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/describe-settings.json
View file

@ -78,7 +78,7 @@
"name": "allowed_editors", "name": "allowed_editors",
"type": "table", "type": "table",
"label": "Allowed Editors", "label": "Allowed Editors",
"help": "List the High Fidelity names for people you want to be able to make changes to this domain.<br/>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.<br/>An empty list means everyone.",
"numbered": false, "numbered": false,
"columns": [ "columns": [
{ {

2
libraries/entities/src/EntityTree.h
View file

@ -162,7 +162,7 @@ private:
void processRemovedEntities(const DeleteEntityOperator& theOperator); void processRemovedEntities(const DeleteEntityOperator& theOperator);
bool updateEntityWithElement(EntityItem* entity, const EntityItemProperties& properties, bool updateEntityWithElement(EntityItem* entity, const EntityItemProperties& properties,
EntityTreeElement* containingElement, bool AllowLockChange); EntityTreeElement* containingElement, bool allowLockChange);
static bool findNearPointOperation(OctreeElement* element, void* extraData); static bool findNearPointOperation(OctreeElement* element, void* extraData);
static bool findInSphereOperation(OctreeElement* element, void* extraData); static bool findInSphereOperation(OctreeElement* element, void* extraData);
static bool findInCubeOperation(OctreeElement* element, void* extraData); static bool findInCubeOperation(OctreeElement* element, void* extraData);