From 38b228ad18f2376280d7661836b3c8b37279d7c8 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 2 Feb 2011 18:41:11 -0500
Subject: STORM-953 Clarify what happens when you uncheck Allow Public Access
 Note: This change also incorporates STORM-960

---
 doc/contributions.txt                                     | 2 ++
 indra/newview/skins/default/xui/en/floater_about_land.xml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index c61ae66b13..08146e0e47 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -389,6 +389,8 @@ Jonathan Yap
 	VWR-24347
 	STORM-844
 	STORM-643
+	STORM-960
+	STORM-953
 Kage Pixel
 	VWR-11
 Ken March
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 3dd6c60095..937a97797d 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1905,7 +1905,7 @@ Only large parcels can be listed in search.
 			</panel.string>
       <panel.string
        name="allow_public_access">
-        Allow Public Access ([MATURITY])
+        Allow Public Access ([MATURITY]) (Note: Unchecking this will create ban lines)
       </panel.string>
             <panel.string
              name="estate_override">
@@ -1932,7 +1932,7 @@ Only large parcels can be listed in search.
              name="public_access"
              top_pad="5"
              label_text.valign="center"
-             label_text.v_pad="-7" 
+             label_text.v_pad="-2" 
              width="278" />
             <text
              type="string"
-- 
cgit v1.2.3