summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-10-15 16:03:08 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-10-15 16:03:08 -0400
commit64ecc38c841ae0cb0c3d0ccb9b1bf543ecf4230e (patch)
tree24a954501d239ecaa43fe17f6f931e720383c6c2 /indra/newview/llviewerregion.cpp
parenta2ae46ef3a0036a6030ccc1e3ef4fcdfb7f455f3 (diff)
parentcd712960f316496b29c53dce390dd778ad9d27f4 (diff)
Merge branch 'develop' into maxim/lua-nearby-avatars
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-xindra/newview/llviewerregion.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 88e5d900cb..739821d2f5 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -3155,7 +3155,7 @@ void LLViewerRegion::unpackRegionHandshake()
std::string cap = getCapability("ModifyRegion"); // needed for queueQuery
if (cap.empty())
{
- LLFloaterRegionInfo::sRefreshFromRegion(this);
+ LLFloaterRegionInfo::refreshFromRegion(this);
}
else
{
@@ -3167,7 +3167,7 @@ void LLViewerRegion::unpackRegionHandshake()
LLVLComposition* compp = region->getComposition();
if (!compp) { return; }
compp->apply(composition_changes);
- LLFloaterRegionInfo::sRefreshFromRegion(region);
+ LLFloaterRegionInfo::refreshFromRegion(region);
});
}
}