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.

2 files changed, 4 insertions, 4 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();
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index d2a413b073..516cf79fbe 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6613,9 +6613,9 @@ S32 LLVOAvatar::getMaxAnimatedObjectAttachments() const
 {
     S32 max_attach = 0;
     LLSD features;
-    if (getRegion())
+    if (gAgent.getRegion())
     {
-        getRegion()->getSimulatorFeatures(features);
+        gAgent.getRegion()->getSimulatorFeatures(features);
         if (features.has("AnimatedObjects"))
         {
             max_attach = features["AnimatedObjects"]["MaxAgentAnimatedObjectAttachments"].asInteger();