2 files changed, 29 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index a957a2b454..90e0f1bc05 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -74,12 +74,12 @@
     <button
      name="fl_save_changes"
      label="Save"
-     top="389"
+     top_pad="5"
      right="-108"
      height="20"
      width="80"
      enabled="false"
-     follows="top|right"
+     follows="right|bottom"
      layout="topleft"/>
     <button
      name="fl_discard_changes"
@@ -89,6 +89,6 @@
      height="20"
      width="100"
      enabled="false"
-     follows="top|right"
+     follows="right|bottom"
      layout="topleft"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 6c2460378e..21743baf9d 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -381,26 +381,41 @@ Account: [ACCTTYPE]
          follows="all"
          layout="topleft"
          width="200"
-         auto_resize="true"
+         auto_resize="false"
          user_resize="false">
-          <!-- settings will be here -->
-          <check_box
-           name="show_in_search_checkbox"
-           label="Show in search"
-           tool_tip="Let people see you in search results"
-           left="1"
+          <!-- only for self -->
+          <text
+           name="search_label"
+           value="Show my profile in search:"
            top="1"
+           left="1"
+           right="-1"
            height="16"
-           width="130"
+           follows="left|top|right"
+           layout="topleft"/>
+          <combo_box
+           name="show_in_search"
+           tool_tip="Let people see you in search results"
+           left="1"
+           top="18"
+           height="23"
+           width="140"
            follows="left|top"
            layout="topleft"
            visible="true"
-           enabled="false"/>
+           enabled="false">
+            <combo_box.item
+               name="Hide"
+               label="Hide"
+               value="0" />
+            <combo_box.item
+               name="Show"
+               label="Show"
+               value="1" />
+          </combo_box>
         </layout_panel>
 
-
       </layout_stack>
-      
     </layout_panel>
   </layout_stack>