Merge branch develop into project/fonts-update

# Conflicts:
#	indra/llrender/llfontfreetype.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp
index b3452a25c5..f789036e5e 100644
--- a/indra/newview/llfloaterscriptlimits.cpp
+++ b/indra/newview/llfloaterscriptlimits.cpp
@@ -487,13 +487,13 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content)
                         names_requested.push_back(owner_id);
                         if (is_group_owned)
                         {
-                            gCacheName->getGroup(owner_id,
+                            mGroupNameCacheConnection = gCacheName->getGroup(owner_id,
                                 boost::bind(&LLPanelScriptLimitsRegionMemory::onNameCache,
                                     this, _1, _2));
                         }
                         else
                         {
-                            LLAvatarNameCache::get(owner_id,
+                            mAvatarNameCacheConnection = LLAvatarNameCache::get(owner_id,
                                 boost::bind(&LLPanelScriptLimitsRegionMemory::onAvatarNameCache,
                                     this, _1, _2));
                         }