Second Life viewer sources 1.13.3.2

3 files changed, 8 insertions, 24 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index 8056aa9..8184fdb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -464,12 +464,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                              follows="left|top" font="SansSerif" height="18" left_delta="38"
-                             max_length="63" mouse_opaque="true" name="name" width="128" />
-                        <check_box bottom="-24" control_name="FindPeopleOnline" follows="left|top"
-                             font="SansSerifSmall" height="18" initial_value="true" label="Online"
-                             left_delta="136" mouse_opaque="true" name="online check" width="70" />
+                             max_length="63" mouse_opaque="true" name="name" width="200" />
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left_delta="78" mouse_opaque="true"
+                             label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
                              name="Search" width="70" />
                         <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
                              draw_heading="true" fg_disable_color="1, 1, 1, 1"
@@ -478,8 +475,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              multi_select="false" name="results" search_column="2" width="326">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
-                                <column label="Name" name="name" width="174" />
-                                <column label="Online" name="online" width="100" />
+                                <column label="Name" name="name" width="274" />
                         </scroll_list>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index f285008..1cc6f54 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -42,21 +42,9 @@
                              text_readonly_color="1, 1, 1, 1" width="180" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="200"
+                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left_delta="200"
                              mouse_opaque="true" name="online_yes" v_pad="0" width="130">
-                                Online: Yes
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
-                             mouse_opaque="true" name="online_no" v_pad="0" width="130">
-                                Online: No
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
-                             mouse_opaque="true" name="online_unknown" v_pad="0" width="130">
-                                Online: Unknown
+                                Currently Online
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml
index 5214ece..e787d2a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml
@@ -6,12 +6,12 @@
              bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
              left="12" mouse_opaque="false" name="text_box" v_pad="0" width="128">
-                Online Status in Search:
+                Profile Online Status:
         </text>
         <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" hidden="false" initial_value="false"
-             label="Make my online status visible in Search" left="148" mouse_opaque="true"
-             name="directory_visibility" radio_style="false" width="350" />
+             label="Make my online status visible only to my Friends" left="148" mouse_opaque="true"
+             name="online_visibility" radio_style="false" width="350" />
         <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="10" hidden="false"