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

Updated LLViewerParcelMgr.

Browse Source 
Added LLViewerParcelMgr::setTeleportFinishedCallback, setTeleportFailedCallback. Not hooked into anything yet, however.
agentCanBuild, agentCanFly, etc, renamed.
This commit is contained in:
Shyotl
2011-08-19 02:15:22 -05:00
parent 13e0359c6e
commit 863ab7fa6b
7 changed files with 193 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llfloaterbuyland.cpp
View File

@@ -334,9 +334,8 @@ LLFloaterBuyLandUI::LLFloaterBuyLandUI()
LLFloaterBuyLandUI::~LLFloaterBuyLandUI()
{
LLViewerParcelMgr::getInstance()->deleteParcelBuy(&mParcelBuyInfo);
delete mTransaction;
LLViewerParcelMgr::getInstance()->deleteParcelBuy(mParcelBuyInfo);
if (sInstance == this)
{
@@ -494,10 +493,18 @@ void LLFloaterBuyLandUI::updateParcelInfo()
return;
}
if (!authorizedBuyer.isNull() && buyer != authorizedBuyer)
if (!authorizedBuyer.isNull() && buyer != authorizedBuyer)
{
mCannotBuyReason = getString("set_to_sell_to_other");
return;
// Maybe the parcel is set for sale to a group we are in.
bool authorized_group =
gAgent.hasPowerInGroup(authorizedBuyer,GP_LAND_DEED)
&& gAgent.hasPowerInGroup(authorizedBuyer,GP_LAND_SET_SALE_INFO);
if (!authorized_group)
{
mCannotBuyReason = getString("set_to_sell_to_other");
return;
}
}
}
else
@@ -807,7 +814,7 @@ void LLFloaterBuyLandUI::sendBuyLand()
if (mParcelBuyInfo)
{
LLViewerParcelMgr::getInstance()->sendParcelBuy(mParcelBuyInfo);
LLViewerParcelMgr::getInstance()->deleteParcelBuy(mParcelBuyInfo);
LLViewerParcelMgr::getInstance()->deleteParcelBuy(&mParcelBuyInfo);
mBought = true;
}
}