summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-10-04 19:52:11 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-10-04 19:52:11 +0100
commit20b7f4684c8182a02422160ad3c5b6102dc8f997 (patch)
tree0caf5fafd188a69622e87e115140e80f687b3ed8 /indra/newview/llviewerobject.cpp
parent497a4109d809f7aa5818d5c5dfecb7ca8cf3b1f9 (diff)
MAINT-7867 - changed simulator feature query so we're only looking in the agent's region. This assumes that all regions will have the same settings, which is normally a safe assumption.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 17e3d68c72..0a05a96f09 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3596,9 +3596,9 @@ S32 LLViewerObject::getAnimatedObjectMaxTris() const
{
S32 max_tris = 0;
LLSD features;
- if (getRegion())
+ if (gAgent.getRegion())
{
- getRegion()->getSimulatorFeatures(features);
+ gAgent.getRegion()->getSimulatorFeatures(features);
if (features.has("AnimatedObjects"))
{
max_tris = features["AnimatedObjects"]["AnimatedObjectMaxTris"].asInteger();