Second Life viewer sources 1.22.0-RC

2 files changed, 15 insertions, 9 deletions

diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
index d7a6540..e6034df 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
@@ -481,13 +481,17 @@ Go to World menu > About Land or select another parcel to show its details.
                         </text>

                         <check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall"

                              height="16" initial_value="false" label="Edit Terrain" left="14"

-                             mouse_opaque="true" name="edit land check" radio_style="false" width="268" />

+                             mouse_opaque="true" name="edit land check" radio_style="false"

+                             tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."

+                             width="268" />

                         <check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"

                              height="16" initial_value="false" label="Create Landmarks" left="14"

                              mouse_opaque="true" name="check landmark" radio_style="false" width="268" />

                         <check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"

                              height="16" initial_value="false" label="Fly" left="14" mouse_opaque="true"

-                             name="check fly" radio_style="false" width="268" />

+                             name="check fly" radio_style="false"

+                             tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."

+                             width="268" />

                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

                              bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"

                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="178"

@@ -538,11 +542,13 @@ Go to World menu > About Land or select another parcel to show its details.
                         </text>

                         <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"

                              height="16" initial_value="false" label="Safe (no damage)" left="14"

-                             mouse_opaque="true" name="check safe" radio_style="false" width="268" />

+                             mouse_opaque="true" name="check safe" radio_style="false"

+                             tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."

+                             width="268" />

                         <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"

-                             height="16" initial_value="false" label="Restrict Pushing" left="178"

+                             height="16" initial_value="false" label="No Pushing" left="178"

                              mouse_opaque="true" name="PushRestrictCheck" radio_style="false"

-                             tool_tip="llPushObject will only work through parcel owner scripts or on scripts where the pushee is the script owner."

+                             tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."

                              width="119" />

                         <check_box bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"

                              height="16" initial_value="false"

@@ -622,7 +628,7 @@ Go to World menu > About Land or select another parcel to show its details.
                         <button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"

                              halign="center" height="16" label="Set" label_selected="Set" left="236"

                              mouse_opaque="true" name="Set" scale_image="true"

-                             tool_tip="Set the landing point to your avatar&apos;s location. It must be inside this land parcel."

+                             tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."

                              width="50" />

                         <button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"

                              halign="center" height="16" label="Clear" label_selected="Clear" left="291"

@@ -650,10 +656,10 @@ Go to World menu > About Land or select another parcel to show its details.
                                 </combo_item>

                         </combo_box>

                         <string name="push_restrict_text">

-                                Restrict Pushing

+                                No Pushing

                         </string>

                         <string name="push_restrict_region_text">

-                                Restrict Pushing (Region Override)

+                                No Pushing (Region Override)

                         </string>

                 </panel>

                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"

diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
index 3387566..a8e0f2e 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
@@ -75,7 +75,7 @@
              halign="center" height="18" image_selected="status_no_push.tga"

              image_unselected="status_no_push.tga" label="" label_selected="" left="521"

              mouse_opaque="true" name="restrictpush" scale_image="false"

-             tool_tip="llPushObject restricted" visible="false" width="24" />

+             tool_tip="No Pushing" visible="false" width="24" />

         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"

              halign="center" height="18" image_selected="status_no_voice.tga"

              image_unselected="status_no_voice.tga" label="" label_selected=""