summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.h
diff options
context:
space:
mode:
authorRider Linden <none@none>2015-04-15 11:54:18 -0700
committerRider Linden <none@none>2015-04-15 11:54:18 -0700
commit109e2db131514de43a2d61da1cc4ee78dc89f858 (patch)
tree217ca4b42ee516dab39198661e2bc91514a5a8e5 /indra/newview/llappviewer.h
parent176d8cd268611e28c07a462df3027f4872456e5a (diff)
parent82ae214f6a367e17dd335e80e2444cf672108821 (diff)
Merge
Diffstat (limited to 'indra/newview/llappviewer.h')
-rwxr-xr-xindra/newview/llappviewer.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index e0f3f326c7..e8a1ca036b 100755
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -275,6 +275,8 @@ private:
bool mQuitRequested; // User wants to quit, may have modified documents open.
bool mLogoutRequestSent; // Disconnect message sent to simulator, no longer safe to send messages to the sim.
S32 mYieldTime;
+ U32 mLastAgentControlFlags;
+ F32 mLastAgentForceUpdate;
struct SettingsFiles* mSettingsLocationList;
LLWatchdogTimeout* mMainloopTimeout;
@@ -314,6 +316,7 @@ public:
// consts from viewer.h
const S32 AGENT_UPDATES_PER_SECOND = 10;
+const S32 AGENT_FORCE_UPDATES_PER_SECOND = 1;
// Globals with external linkage. From viewer.h
// *NOTE:Mani - These will be removed as the Viewer App Cleanup project continues.