diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-12 10:27:20 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-12 10:27:20 +0000 |
| commit | 1aba72c75bb1982a7fd4293fbc5ab3a42a3b0a92 (patch) | |
| tree | adf251fbb49c71f0ff076a1f822a4219c584641c /indra | |
| parent | a158cdb133f923e5d94c74a9240d8634d9718a08 (diff) | |
| parent | 4dc63de6a8b26e3b880771f043b20d8eded2d8e5 (diff) | |
PE merge
Diffstat (limited to 'indra')
| -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" |