diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
| commit | a7f02a3e51f07c657a0acd31637f46f74b30daf7 (patch) | |
| tree | c572c162ee7bec027971ca7a64f74032938b20a8 /indra/newview/llfloaterscriptlimits.cpp | |
| parent | cce59647a99648af63c96168c36e85563da40a1a (diff) | |
| parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) | |
merge changes for 3.5.0-beta2
Diffstat (limited to 'indra/newview/llfloaterscriptlimits.cpp')
| -rw-r--r-- | indra/newview/llfloaterscriptlimits.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp index a50907601c..8d8bba7b17 100644 --- a/indra/newview/llfloaterscriptlimits.cpp +++ b/indra/newview/llfloaterscriptlimits.cpp @@ -602,15 +602,7 @@ void LLPanelScriptLimitsRegionMemory::onNameCache( return; } - std::string name; - if (LLAvatarNameCache::useDisplayNames()) - { - name = LLCacheName::buildUsername(full_name); - } - else - { - name = full_name; - } + std::string name = LLCacheName::buildUsername(full_name); std::vector<LLSD>::iterator id_itor; for (id_itor = mObjectListItems.begin(); id_itor != mObjectListItems.end(); ++id_itor) @@ -713,10 +705,7 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content) else { name_is_cached = gCacheName->getFullName(owner_id, owner_buf); // username - if (LLAvatarNameCache::useDisplayNames()) - { - owner_buf = LLCacheName::buildUsername(owner_buf); - } + owner_buf = LLCacheName::buildUsername(owner_buf); } if(!name_is_cached) { |