From bef014ad2ab9496755ef266cdfaeb9f9c333b240 Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Fri, 8 Jul 2011 15:41:55 -0700
Subject: ER-910 cleanup:  removed a stale comment, tweaked text in About Land
 dialog Options tab.

---
 indra/newview/llfloaterland.cpp                    |  2 +-
 .../skins/default/xui/en/floater_about_land.xml    | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index b373a6afa0..9b7593ce61 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -1972,7 +1972,7 @@ void LLPanelLandOptions::refresh()
 		mPushRestrictionCtrl->set(FALSE);
 		mPushRestrictionCtrl->setEnabled(FALSE);
 
-		mSeeAvatarsCtrl->set(TRUE);				// NOTE - reversed FALSE/TRUE for 'see avatars' prototype
+		mSeeAvatarsCtrl->set(TRUE);
 		mSeeAvatarsCtrl->setEnabled(FALSE);
 
 		mLandingTypeCombo->setCurrentByIndex(0);
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 5067ef7167..07cb4c12f5 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1207,8 +1207,7 @@ Only large parcels can be listed in search.
             </panel.string>
             <panel.string
              name="see_avs_text">
-                 Allow avatars on other parcels to see
- and chat with avatars on this parcel
+                 See and chat with residents on this parcel
             </panel.string>
             <text
              type="string"
@@ -1516,14 +1515,27 @@ Only large parcels can be listed in search.
              fallback_image="default_land_picture.j2c" 
              tool_tip="Click to choose a picture"
              width="195" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             text_color="white"
+             height="16"
+             layout="topleft"
+             left="230"
+             top="174"
+             name="allow_label5"
+             width="278">
+              Allow Residents on other parcels to:
+            </text>
             <check_box
-             height="32"
+             height="16"
              label="See Avatars"
+             follows="top"
              layout="topleft"
              left="230"
-             top="164"
              name="SeeAvatarsCheck"
-             tool_tip="Allows avatars on other parcels to see and chat with avatars on this parcel, and you to see and chat with them."
+             tool_tip="Allows residents on other parcels to see and chat with residents on this parcel, and you to see and chat with them."
              width="120" />
             <text
              type="string"
-- 
cgit v1.2.3