diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-12 11:12:09 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-12 11:12:09 -0800 |
| commit | 3824a94628af6b03f600ee5a8025409736d0db5a (patch) | |
| tree | ff5b8274daa585a386853b4d9e7b3399656c1f5d /indra/newview | |
| parent | e712889cc21e0724bbdd9d89597df74a3caee83f (diff) | |
| parent | 8f548880714b84d5fc557fd2c1e1344c55dcfb54 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 21 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 21 |
2 files changed, 12 insertions, 30 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 26a179074d..65003d9b5c 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -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")); + } } } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index a2540237c8..5680b91c05 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5379,27 +5379,6 @@ Grant this request? </form> </notification> - <notification - icon="notify.tga" - name="ScriptToast" - type="notify"> - [FIRST] [LAST]'s '[TITLE]' 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" |