From d87cd2af6e979f3010bb21a6ac4992a921233238 Mon Sep 17 00:00:00 2001
From: Clement <clement.brisset@gmail.com>
Date: Tue, 1 May 2018 18:23:00 -0700
Subject: [PATCH] Update avatar query names

---
 assignment-client/src/Agent.cpp | 14 +++++++-------
 assignment-client/src/Agent.h   |  4 ++--
 interface/src/Application.cpp   |  4 ++--
 interface/src/Application.h     |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index da811b8af5..42924a8487 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -548,18 +548,18 @@ void Agent::setIsAvatar(bool isAvatar) {
     if (_isAvatar && !_avatarIdentityTimer) {
         // set up the avatar timers
         _avatarIdentityTimer = new QTimer(this);
-        _avatarViewTimer = new QTimer(this);
+        _avatarQueryTimer = new QTimer(this);
 
         // connect our slot
         connect(_avatarIdentityTimer, &QTimer::timeout, this, &Agent::sendAvatarIdentityPacket);
-        connect(_avatarViewTimer, &QTimer::timeout, this, &Agent::sendAvatarViewFrustum);
+        connect(_avatarQueryTimer, &QTimer::timeout, this, &Agent::queryAvatars);
 
         static const int AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS = 1000;
         static const int AVATAR_VIEW_PACKET_SEND_INTERVAL_MSECS = 1000;
 
         // start the timers
         _avatarIdentityTimer->start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS);  // FIXME - we shouldn't really need to constantly send identity packets
-        _avatarViewTimer->start(AVATAR_VIEW_PACKET_SEND_INTERVAL_MSECS);
+        _avatarQueryTimer->start(AVATAR_VIEW_PACKET_SEND_INTERVAL_MSECS);
 
         // tell the avatarAudioTimer to start ticking
         QMetaObject::invokeMethod(&_avatarAudioTimer, "start");
@@ -572,9 +572,9 @@ void Agent::setIsAvatar(bool isAvatar) {
             delete _avatarIdentityTimer;
             _avatarIdentityTimer = nullptr;
 
-            _avatarViewTimer->stop();
-            delete _avatarViewTimer;
-            _avatarViewTimer = nullptr;
+            _avatarQueryTimer->stop();
+            delete _avatarQueryTimer;
+            _avatarQueryTimer = nullptr;
 
             // The avatar mixer never times out a connection (e.g., based on identity or data packets)
             // but rather keeps avatars in its list as long as "connected". As a result, clients timeout
@@ -607,7 +607,7 @@ void Agent::sendAvatarIdentityPacket() {
     }
 }
 
-void Agent::sendAvatarViewFrustum() {
+void Agent::queryAvatars() {
     auto scriptedAvatar = DependencyManager::get<ScriptableAvatar>();
 
     ViewFrustum view;
diff --git a/assignment-client/src/Agent.h b/assignment-client/src/Agent.h
index d144f0bc01..0cdc9e0029 100644
--- a/assignment-client/src/Agent.h
+++ b/assignment-client/src/Agent.h
@@ -97,7 +97,7 @@ private:
     void setAvatarSound(SharedSoundPointer avatarSound) { _avatarSound = avatarSound; }
 
     void sendAvatarIdentityPacket();
-    void sendAvatarViewFrustum();
+    void queryAvatars();
 
     QString _scriptContents;
     QTimer* _scriptRequestTimeout { nullptr };
@@ -107,7 +107,7 @@ private:
     int _numAvatarSoundSentBytes = 0;
     bool _isAvatar = false;
     QTimer* _avatarIdentityTimer = nullptr;
-    QTimer* _avatarViewTimer = nullptr;
+    QTimer* _avatarQueryTimer = nullptr;
     QHash<QUuid, quint16> _outgoingScriptAudioSequenceNumbers;
 
     AudioGate _audioGate;
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d14af685f0..f9d048b6ac 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5682,7 +5682,7 @@ void Application::update(float deltaTime) {
             if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) {
                 queryOctree(NodeType::EntityServer, PacketType::EntityQuery);
             }
-            sendAvatarViewFrustum();
+            queryAvatars();
 
             _lastQueriedViews = _conicalViews;
             _lastQueriedTime = now;
@@ -5857,7 +5857,7 @@ void Application::update(float deltaTime) {
     }
 }
 
-void Application::sendAvatarViewFrustum() {
+void Application::queryAvatars() {
     auto avatarPacket = NLPacket::create(PacketType::AvatarQuery);
     auto destinationBuffer = reinterpret_cast<unsigned char*>(avatarPacket->getPayload());
     unsigned char* bufferStart = destinationBuffer;
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 6d749f9458..4a9c293237 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -492,9 +492,9 @@ private:
     void updateDialogs(float deltaTime) const;
 
     void queryOctree(NodeType_t serverType, PacketType packetType);
+    void queryAvatars();
 
     int sendNackPackets();
-    void sendAvatarViewFrustum();
 
     std::shared_ptr<MyAvatar> getMyAvatar() const;