livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Eli Linden 2010-03-12 11:12:09 -08:00
parent e712889cc2 8f54888071
commit 3824a94628
3 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llfontregistry.cpp
View File

@ -469,6 +469,8 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
else
{
fontlist.push_back(fontp->mFontFreetype);
delete fontp;
fontp = NULL;
}
}
}

21
indra/newview/llfloaterland.cpp
View File

@ -820,16 +820,19 @@ void LLPanelLandGeneral::refreshNames()
}
mTextGroup->setText(group);
const LLUUID& auth_buyer_id = parcel->getAuthorizedBuyerID();
if(auth_buyer_id.notNull())
if (parcel->getForSale())
{
std::string name;
name = LLSLURL::buildCommand("agent", auth_buyer_id, "inspect");
mSaleInfoForSale2->setTextArg("[BUYER]", name);
}
else
{
mSaleInfoForSale2->setTextArg("[BUYER]", getString("anyone"));
const LLUUID& auth_buyer_id = parcel->getAuthorizedBuyerID();
if(auth_buyer_id.notNull())
{
std::string name;
name = LLSLURL::buildCommand("agent", auth_buyer_id, "inspect");
mSaleInfoForSale2->setTextArg("[BUYER]", name);
}
else
{
mSaleInfoForSale2->setTextArg("[BUYER]", getString("anyone"));
}
}
}

21
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -5379,27 +5379,6 @@ Grant this request?
</form>
</notification>
<notification
icon="notify.tga"
name="ScriptToast"
type="notify">
[FIRST] [LAST]&apos;s &apos;[TITLE]&apos; is requesting Resident input.
<form name="form">
<button
index="0"
name="Open"
text="Open Dialog"/>
<button
index="1"
name="Ignore"
text="Ignore"/>
<button
index="2"
name="Block"
text="Block"/>
</form>
</notification>
<!--
<notification
icon="notify.tga"