From da914f0a4fbf624113e49219c8ceb94b903755bb Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Tue, 24 Jan 2017 11:59:31 -0800
Subject: [PATCH] bypass entity-server edit filter if you have lock/unlock
 rights

---
 libraries/entities/src/EntityTree.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 9d5d14402d..dbf5cbe72a 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1053,7 +1053,8 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
 
                 startFilter = usecTimestampNow();
                 bool wasChanged = false;
-                bool allowed = filterProperties(properties, properties, wasChanged);
+                // Having (un)lock rights bypasses the filter.
+                bool allowed = senderNode->isAllowedEditor() || filterProperties(properties, properties, wasChanged);
                 if (!allowed) {
                     properties = EntityItemProperties();
                 }