diff options
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 2ff483cd34..928d5c3a31 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -823,19 +823,19 @@ void LLPanelLandGeneral::refreshNames() if (parcel->getForSale()) { - 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")); - } + 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")); } } +} // virtual @@ -1388,10 +1388,9 @@ bool LLPanelLandObjects::callbackReturnOwnerObjects(const LLSD& notification, co } else { - std::string first, last; - gCacheName->getName(owner_id, first, last); - args["FIRST"] = first; - args["LAST"] = last; + std::string full_name; + gCacheName->getFullName(owner_id, full_name); + args["NAME"] = full_name; LLNotificationsUtil::add("OtherObjectsReturned", args); } send_return_objects_message(parcel->getLocalID(), RT_OWNER); @@ -2507,7 +2506,7 @@ void LLPanelLandAccess::refresh() if (maturity_pos != std::string::npos) { maturity_string.replace(maturity_pos, MATURITY.length(), std::string("")); - } + } maturity_checkbox->setLabel(maturity_string); } |