Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Issue 662] Plug in LLPanelEstateInfo::updateEstate* functions

Browse Source
This commit is contained in:
Lirusaito
2013-03-01 19:31:18 -05:00
parent bbe81a86f5
commit ab21a74bfc
3 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
indra/newview/llfloaterregioninfo.cpp
View File

@@ -1909,6 +1909,26 @@ void LLPanelEstateInfo::sendEstateAccessDelta(U32 flags, const LLUUID& agent_or_
gAgent.sendReliableMessage();
}
// static
void LLPanelEstateInfo::updateEstateOwnerName(const std::string& name)
{
LLPanelEstateInfo* panelp = LLFloaterRegionInfo::getPanelEstate();
if (panelp)
{
panelp->setOwnerName(name);
}
}
// static
void LLPanelEstateInfo::updateEstateName(const std::string& name)
{
LLPanelEstateInfo* panelp = LLFloaterRegionInfo::getPanelEstate();
if (panelp)
{
panelp->getChildRef<LLTextBox>("estate_name").setText(name);
}
}
void LLPanelEstateInfo::updateControls(LLViewerRegion* region)
{
BOOL god = gAgent.isGodlike();
@@ -2078,14 +2098,7 @@ void LLPanelEstateInfo::refreshFromEstate()
const LLEstateInfoModel& estate_info = LLEstateInfoModel::instance();
getChild<LLUICtrl>("estate_name")->setValue(estate_info.getName());
const LLUUID& owner_id = estate_info.getOwnerID();
std::string owner_name;
if (!LLAvatarNameCache::getPNSName(owner_id, owner_name))
{
llwarns << "Failed to getPNSName for " << owner_id << ". Falling back to legacy." << llendl;
gCacheName->getFullName(owner_id, owner_name);
}
setOwnerName(owner_name);
LLAvatarNameCache::get(estate_info.getOwnerID(), boost::bind(&LLPanelEstateInfo::setOwnerPNSName, this, _1, _2));
getChild<LLUICtrl>("externally_visible_check")->setValue(estate_info.getIsExternallyVisible());
getChild<LLUICtrl>("voice_chat_check")->setValue(estate_info.getAllowVoiceChat());
@@ -2227,6 +2240,13 @@ void LLPanelEstateInfo::setOwnerName(const std::string& name)
getChild<LLUICtrl>("estate_owner")->setValue(LLSD(name));
}
void LLPanelEstateInfo::setOwnerPNSName(const LLUUID& agent_id, const LLAvatarName& av_name)
{
std::string name;
LLAvatarNameCache::getPNSName(av_name, name);
setOwnerName(name);
}
void LLPanelEstateInfo::clearAccessLists()
{
LLNameListCtrl* name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");