Merged SL 1.23.4 into Imprudence.

Conflicts: linden/doc/contributions.txt linden/indra/CMakeLists.txt linden/indra/cmake/APR.cmake linden/indra/cmake/CopyWinLibs.cmake linden/indra/cmake/OPENAL.cmake linden/indra/develop.py linden/indra/llaudio/audioengine.cpp linden/indra/llcommon/indra_constants.h linden/indra/llcommon/llversionviewer.h linden/indra/llcrashlogger/llcrashlogger.cpp linden/indra/llmedia/llmediaimplgstreamer.cpp linden/indra/llmedia/llmediaimplgstreamer.h linden/indra/llmedia/llmediaimplgstreamer_syms.cpp linden/indra/llmedia/llmediaimplgstreamer_syms.h linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc linden/indra/llmedia/llmediamanager.cpp linden/indra/llmessage/llassetstorage.cpp linden/indra/llui/lltexteditor.cpp linden/indra/llvfs/lldir.cpp linden/indra/newview/CMakeLists.txt linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/app_settings/logcontrol.xml linden/indra/newview/app_settings/settings.xml linden/indra/newview/installers/windows/installer_template.nsi linden/indra/newview/llagent.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llcallingcard.cpp linden/indra/newview/llfilepicker.cpp linden/indra/newview/llfloateractivespeakers.cpp linden/indra/newview/llfloateravatarpicker.cpp linden/indra/newview/llfloaterbulkpermission.cpp linden/indra/newview/llfloaterbulkpermission.h linden/indra/newview/llfloaterchat.cpp linden/indra/newview/llfloatergodtools.cpp linden/indra/newview/llfloaterhtmlhelp.cpp linden/indra/newview/llfloatertools.cpp linden/indra/newview/llfloatertools.h linden/indra/newview/llfloatertopobjects.cpp linden/indra/newview/llinventorybridge.cpp linden/indra/newview/llinventoryview.cpp linden/indra/newview/llnetmap.cpp linden/indra/newview/llnetmap.h linden/indra/newview/llpanelland.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/llpanelobject.cpp linden/indra/newview/llprefsim.cpp linden/indra/newview/lltexturecache.cpp linden/indra/newview/lltoolbrush.cpp linden/indra/newview/llvieweraudio.cpp linden/indra/newview/llviewermenu.cpp linden/indra/newview/llviewermessage.cpp linden/indra/newview/llviewerparcelmedia.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/llwebbrowserctrl.cpp linden/indra/newview/llworldmapview.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/colors_base.xml linden/indra/newview/skins/default/xui/de/floater_active_speakers.xml linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml linden/indra/newview/skins/default/xui/de/floater_joystick.xml linden/indra/newview/skins/default/xui/de/floater_mute_object.xml linden/indra/newview/skins/default/xui/de/floater_sim_release_message.xml linden/indra/newview/skins/default/xui/de/panel_media_controls.xml linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/de/strings.xml linden/indra/newview/skins/default/xui/de/teleport_strings.xml linden/indra/newview/skins/default/xui/en-us/alerts.xml linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml linden/indra/newview/skins/default/xui/en-us/floater_tools.xml linden/indra/newview/skins/default/xui/en-us/menu_login.xml linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml linden/indra/newview/skins/default/xui/en-us/notify.xml linden/indra/newview/skins/default/xui/en-us/panel_bars.xml linden/indra/newview/skins/default/xui/en-us/panel_groups.xml linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/en-us/strings.xml linden/indra/newview/skins/default/xui/es/alerts.xml linden/indra/newview/skins/default/xui/es/floater_about.xml linden/indra/newview/skins/default/xui/es/floater_about_land.xml linden/indra/newview/skins/default/xui/es/floater_animation_preview.xml linden/indra/newview/skins/default/xui/es/floater_auction.xml linden/indra/newview/skins/default/xui/es/floater_avatar_picker.xml linden/indra/newview/skins/default/xui/es/floater_avatar_textures.xml linden/indra/newview/skins/default/xui/es/floater_build_options.xml linden/indra/newview/skins/default/xui/es/floater_bumps.xml linden/indra/newview/skins/default/xui/es/floater_buy_contents.xml linden/indra/newview/skins/default/xui/es/floater_buy_currency.xml linden/indra/newview/skins/default/xui/es/floater_buy_land.xml linden/indra/newview/skins/default/xui/es/floater_buy_object.xml linden/indra/newview/skins/default/xui/es/floater_chat_history.xml linden/indra/newview/skins/default/xui/es/floater_choose_group.xml linden/indra/newview/skins/default/xui/es/floater_clothing.xml linden/indra/newview/skins/default/xui/es/floater_color_picker.xml linden/indra/newview/skins/default/xui/es/floater_critical.xml linden/indra/newview/skins/default/xui/es/floater_customize.xml linden/indra/newview/skins/default/xui/es/floater_directory.xml linden/indra/newview/skins/default/xui/es/floater_gesture.xml linden/indra/newview/skins/default/xui/es/floater_group_info.xml linden/indra/newview/skins/default/xui/es/floater_html.xml linden/indra/newview/skins/default/xui/es/floater_im.xml linden/indra/newview/skins/default/xui/es/floater_image_preview.xml linden/indra/newview/skins/default/xui/es/floater_import.xml linden/indra/newview/skins/default/xui/es/floater_instant_message.xml linden/indra/newview/skins/default/xui/es/floater_inventory.xml linden/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml linden/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml linden/indra/newview/skins/default/xui/es/floater_land_holdings.xml linden/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml linden/indra/newview/skins/default/xui/es/floater_moveview.xml linden/indra/newview/skins/default/xui/es/floater_mute.xml linden/indra/newview/skins/default/xui/es/floater_name_description.xml linden/indra/newview/skins/default/xui/es/floater_new_im.xml linden/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml linden/indra/newview/skins/default/xui/es/floater_openobject.xml linden/indra/newview/skins/default/xui/es/floater_pay.xml linden/indra/newview/skins/default/xui/es/floater_pay_object.xml linden/indra/newview/skins/default/xui/es/floater_postcard.xml linden/indra/newview/skins/default/xui/es/floater_preferences.xml linden/indra/newview/skins/default/xui/es/floater_preview_animation.xml linden/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml linden/indra/newview/skins/default/xui/es/floater_preview_gesture.xml linden/indra/newview/skins/default/xui/es/floater_preview_notecard.xml linden/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml linden/indra/newview/skins/default/xui/es/floater_preview_sound.xml linden/indra/newview/skins/default/xui/es/floater_preview_texture.xml linden/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml linden/indra/newview/skins/default/xui/es/floater_price_for_listing.xml linden/indra/newview/skins/default/xui/es/floater_profile.xml linden/indra/newview/skins/default/xui/es/floater_report_abuse.xml linden/indra/newview/skins/default/xui/es/floater_script_debug.xml linden/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml linden/indra/newview/skins/default/xui/es/floater_script_preview.xml linden/indra/newview/skins/default/xui/es/floater_script_queue.xml linden/indra/newview/skins/default/xui/es/floater_script_search.xml linden/indra/newview/skins/default/xui/es/floater_sell_land.xml linden/indra/newview/skins/default/xui/es/floater_settings_debug.xml linden/indra/newview/skins/default/xui/es/floater_snapshot.xml linden/indra/newview/skins/default/xui/es/floater_sound_preview.xml linden/indra/newview/skins/default/xui/es/floater_telehub.xml linden/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml linden/indra/newview/skins/default/xui/es/floater_tools.xml linden/indra/newview/skins/default/xui/es/floater_top_objects.xml linden/indra/newview/skins/default/xui/es/floater_tos.xml linden/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml linden/indra/newview/skins/default/xui/es/floater_world_map.xml linden/indra/newview/skins/default/xui/es/menu_inventory.xml linden/indra/newview/skins/default/xui/es/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/es/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/es/menu_pie_land.xml linden/indra/newview/skins/default/xui/es/menu_pie_object.xml linden/indra/newview/skins/default/xui/es/menu_pie_self.xml linden/indra/newview/skins/default/xui/es/menu_viewer.xml linden/indra/newview/skins/default/xui/es/notify.xml linden/indra/newview/skins/default/xui/es/panel_avatar.xml linden/indra/newview/skins/default/xui/es/panel_avatar_classified.xml linden/indra/newview/skins/default/xui/es/panel_avatar_pick.xml linden/indra/newview/skins/default/xui/es/panel_chat_bar.xml linden/indra/newview/skins/default/xui/es/panel_classified.xml linden/indra/newview/skins/default/xui/es/panel_event.xml linden/indra/newview/skins/default/xui/es/panel_group.xml linden/indra/newview/skins/default/xui/es/panel_group_finder.xml linden/indra/newview/skins/default/xui/es/panel_group_general.xml linden/indra/newview/skins/default/xui/es/panel_group_invite.xml linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml linden/indra/newview/skins/default/xui/es/panel_group_notices.xml linden/indra/newview/skins/default/xui/es/panel_group_roles.xml linden/indra/newview/skins/default/xui/es/panel_group_voting.xml linden/indra/newview/skins/default/xui/es/panel_land_covenant.xml linden/indra/newview/skins/default/xui/es/panel_login.xml linden/indra/newview/skins/default/xui/es/panel_overlaybar.xml linden/indra/newview/skins/default/xui/es/panel_place.xml linden/indra/newview/skins/default/xui/es/panel_place_small.xml linden/indra/newview/skins/default/xui/es/panel_preferences_audio.xml linden/indra/newview/skins/default/xui/es/panel_preferences_chat.xml linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml linden/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/es/panel_preferences_im.xml linden/indra/newview/skins/default/xui/es/panel_preferences_input.xml linden/indra/newview/skins/default/xui/es/panel_preferences_network.xml linden/indra/newview/skins/default/xui/es/panel_preferences_popups.xml linden/indra/newview/skins/default/xui/es/panel_region_covenant.xml linden/indra/newview/skins/default/xui/es/panel_region_debug.xml linden/indra/newview/skins/default/xui/es/panel_region_estate.xml linden/indra/newview/skins/default/xui/es/panel_region_general.xml linden/indra/newview/skins/default/xui/es/panel_region_terrain.xml linden/indra/newview/skins/default/xui/es/panel_region_texture.xml linden/indra/newview/skins/default/xui/es/panel_scrolling_param.xml linden/indra/newview/skins/default/xui/es/panel_status_bar.xml linden/indra/newview/skins/default/xui/es/panel_toolbar.xml linden/indra/newview/skins/default/xui/es/panel_top_pick.xml linden/indra/newview/skins/default/xui/fr/alerts.xml linden/indra/newview/skins/default/xui/fr/floater_about.xml linden/indra/newview/skins/default/xui/fr/floater_about_land.xml linden/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml linden/indra/newview/skins/default/xui/fr/floater_beacons.xml linden/indra/newview/skins/default/xui/fr/floater_buy_contents.xml linden/indra/newview/skins/default/xui/fr/floater_buy_currency.xml linden/indra/newview/skins/default/xui/fr/floater_buy_land.xml linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml linden/indra/newview/skins/default/xui/fr/floater_clothing.xml linden/indra/newview/skins/default/xui/fr/floater_customize.xml linden/indra/newview/skins/default/xui/fr/floater_directory.xml linden/indra/newview/skins/default/xui/fr/floater_god_tools.xml linden/indra/newview/skins/default/xui/fr/floater_group_info.xml linden/indra/newview/skins/default/xui/fr/floater_html.xml linden/indra/newview/skins/default/xui/fr/floater_im.xml linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml linden/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml linden/indra/newview/skins/default/xui/fr/floater_inventory.xml linden/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml linden/indra/newview/skins/default/xui/fr/floater_joystick.xml linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml linden/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml linden/indra/newview/skins/default/xui/fr/floater_media_browser.xml linden/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml linden/indra/newview/skins/default/xui/fr/floater_name_description.xml linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml linden/indra/newview/skins/default/xui/fr/floater_profile.xml linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml linden/indra/newview/skins/default/xui/fr/floater_script_search.xml linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml linden/indra/newview/skins/default/xui/fr/floater_snapshot.xml linden/indra/newview/skins/default/xui/fr/floater_sound_preview.xml linden/indra/newview/skins/default/xui/fr/floater_tools.xml linden/indra/newview/skins/default/xui/fr/floater_top_objects.xml linden/indra/newview/skins/default/xui/fr/floater_world_map.xml linden/indra/newview/skins/default/xui/fr/menu_inventory.xml linden/indra/newview/skins/default/xui/fr/menu_login.xml linden/indra/newview/skins/default/xui/fr/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/fr/menu_pie_object.xml linden/indra/newview/skins/default/xui/fr/menu_viewer.xml linden/indra/newview/skins/default/xui/fr/notify.xml linden/indra/newview/skins/default/xui/fr/panel_audio.xml linden/indra/newview/skins/default/xui/fr/panel_avatar.xml linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml linden/indra/newview/skins/default/xui/fr/panel_classified.xml linden/indra/newview/skins/default/xui/fr/panel_event.xml linden/indra/newview/skins/default/xui/fr/panel_friends.xml linden/indra/newview/skins/default/xui/fr/panel_group_general.xml linden/indra/newview/skins/default/xui/fr/panel_group_invite.xml linden/indra/newview/skins/default/xui/fr/panel_group_land_money.xml linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml linden/indra/newview/skins/default/xui/fr/panel_login.xml linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml linden/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml linden/indra/newview/skins/default/xui/fr/panel_overlaybar.xml linden/indra/newview/skins/default/xui/fr/panel_place.xml linden/indra/newview/skins/default/xui/fr/panel_place_small.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_input.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_network.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/fr/panel_region_covenant.xml linden/indra/newview/skins/default/xui/fr/panel_region_debug.xml linden/indra/newview/skins/default/xui/fr/panel_region_general.xml linden/indra/newview/skins/default/xui/fr/panel_voice_controls.xml linden/indra/newview/skins/default/xui/fr/role_actions.xml linden/indra/newview/skins/default/xui/fr/strings.xml linden/indra/newview/skins/default/xui/fr/teleport_strings.xml linden/indra/newview/skins/default/xui/ja/floater_active_speakers.xml linden/indra/newview/skins/default/xui/ja/floater_html.xml linden/indra/newview/skins/default/xui/ja/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml linden/indra/newview/skins/default/xui/ja/floater_joystick.xml linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml linden/indra/newview/skins/default/xui/ja/floater_windlight_options.xml linden/indra/newview/skins/default/xui/ja/menu_login.xml linden/indra/newview/skins/default/xui/ja/panel_friends.xml linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml linden/indra/newview/skins/default/xui/ja/panel_media_remote_expanded.xml linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/ja/panel_speaker_controls.xml linden/indra/newview/skins/default/xui/ja/strings.xml linden/indra/newview/skins/default/xui/ja/teleport_strings.xml linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml linden/indra/newview/skins/default/xui/pt/alerts.xml linden/indra/newview/skins/default/xui/pt/floater_about.xml linden/indra/newview/skins/default/xui/pt/floater_about_land.xml linden/indra/newview/skins/default/xui/pt/floater_active_speakers.xml linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml linden/indra/newview/skins/default/xui/pt/floater_auction.xml linden/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml linden/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml linden/indra/newview/skins/default/xui/pt/floater_beacons.xml linden/indra/newview/skins/default/xui/pt/floater_build_options.xml linden/indra/newview/skins/default/xui/pt/floater_bumps.xml linden/indra/newview/skins/default/xui/pt/floater_buy_contents.xml linden/indra/newview/skins/default/xui/pt/floater_buy_currency.xml linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml linden/indra/newview/skins/default/xui/pt/floater_buy_object.xml linden/indra/newview/skins/default/xui/pt/floater_chat_history.xml linden/indra/newview/skins/default/xui/pt/floater_clothing.xml linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml linden/indra/newview/skins/default/xui/pt/floater_critical.xml linden/indra/newview/skins/default/xui/pt/floater_customize.xml linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml linden/indra/newview/skins/default/xui/pt/floater_directory.xml linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml linden/indra/newview/skins/default/xui/pt/floater_gesture.xml linden/indra/newview/skins/default/xui/pt/floater_god_tools.xml linden/indra/newview/skins/default/xui/pt/floater_group_info.xml linden/indra/newview/skins/default/xui/pt/floater_im.xml linden/indra/newview/skins/default/xui/pt/floater_image_preview.xml linden/indra/newview/skins/default/xui/pt/floater_inspect.xml linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml linden/indra/newview/skins/default/xui/pt/floater_inventory.xml linden/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml linden/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml linden/indra/newview/skins/default/xui/pt/floater_joystick.xml linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml linden/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml linden/indra/newview/skins/default/xui/pt/floater_moveview.xml linden/indra/newview/skins/default/xui/pt/floater_mute.xml linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml linden/indra/newview/skins/default/xui/pt/floater_name_description.xml linden/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml linden/indra/newview/skins/default/xui/pt/floater_openobject.xml linden/indra/newview/skins/default/xui/pt/floater_pay.xml linden/indra/newview/skins/default/xui/pt/floater_postcard.xml linden/indra/newview/skins/default/xui/pt/floater_preferences.xml linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml linden/indra/newview/skins/default/xui/pt/floater_preview_sound.xml linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml linden/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml linden/indra/newview/skins/default/xui/pt/floater_profile.xml linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml linden/indra/newview/skins/default/xui/pt/floater_script_queue.xml linden/indra/newview/skins/default/xui/pt/floater_script_search.xml linden/indra/newview/skins/default/xui/pt/floater_sell_land.xml linden/indra/newview/skins/default/xui/pt/floater_settings_debug.xml linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml linden/indra/newview/skins/default/xui/pt/floater_sound_preview.xml linden/indra/newview/skins/default/xui/pt/floater_telehub.xml linden/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml linden/indra/newview/skins/default/xui/pt/floater_tools.xml linden/indra/newview/skins/default/xui/pt/floater_top_objects.xml linden/indra/newview/skins/default/xui/pt/floater_tos.xml linden/indra/newview/skins/default/xui/pt/floater_url_entry.xml linden/indra/newview/skins/default/xui/pt/floater_water.xml linden/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml linden/indra/newview/skins/default/xui/pt/floater_windlight_options.xml linden/indra/newview/skins/default/xui/pt/floater_world_map.xml linden/indra/newview/skins/default/xui/pt/menu_inventory.xml linden/indra/newview/skins/default/xui/pt/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/pt/menu_pie_land.xml linden/indra/newview/skins/default/xui/pt/menu_pie_object.xml linden/indra/newview/skins/default/xui/pt/menu_viewer.xml linden/indra/newview/skins/default/xui/pt/notify.xml linden/indra/newview/skins/default/xui/pt/panel_account_details.xml linden/indra/newview/skins/default/xui/pt/panel_account_planning.xml linden/indra/newview/skins/default/xui/pt/panel_account_transactions.xml linden/indra/newview/skins/default/xui/pt/panel_audio_device.xml linden/indra/newview/skins/default/xui/pt/panel_avatar.xml linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml linden/indra/newview/skins/default/xui/pt/panel_avatar_pick.xml linden/indra/newview/skins/default/xui/pt/panel_chat_bar.xml linden/indra/newview/skins/default/xui/pt/panel_classified.xml linden/indra/newview/skins/default/xui/pt/panel_event.xml linden/indra/newview/skins/default/xui/pt/panel_friends.xml linden/indra/newview/skins/default/xui/pt/panel_group.xml linden/indra/newview/skins/default/xui/pt/panel_group_finder.xml linden/indra/newview/skins/default/xui/pt/panel_group_general.xml linden/indra/newview/skins/default/xui/pt/panel_group_invite.xml linden/indra/newview/skins/default/xui/pt/panel_group_land_money.xml linden/indra/newview/skins/default/xui/pt/panel_group_notices.xml linden/indra/newview/skins/default/xui/pt/panel_group_roles.xml linden/indra/newview/skins/default/xui/pt/panel_group_voting.xml linden/indra/newview/skins/default/xui/pt/panel_land_covenant.xml linden/indra/newview/skins/default/xui/pt/panel_login.xml linden/indra/newview/skins/default/xui/pt/panel_overlaybar.xml linden/indra/newview/skins/default/xui/pt/panel_place.xml linden/indra/newview/skins/default/xui/pt/panel_place_small.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_general.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_im.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_input.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_network.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_web.xml linden/indra/newview/skins/default/xui/pt/panel_region_covenant.xml linden/indra/newview/skins/default/xui/pt/panel_region_debug.xml linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml linden/indra/newview/skins/default/xui/pt/panel_region_general.xml linden/indra/newview/skins/default/xui/pt/panel_region_terrain.xml linden/indra/newview/skins/default/xui/pt/panel_region_texture.xml linden/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml linden/indra/newview/skins/default/xui/pt/panel_top_pick.xml linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml linden/indra/newview/skins/default/xui/pt/strings.xml linden/indra/newview/skins/default/xui/pt/teleport_strings.xml linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml linden/indra/newview/skins/default/xui/zh/floater_post_process.xml linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/panel_avatar.xml linden/indra/newview/skins/default/xui/zh/panel_friends.xml linden/indra/newview/skins/default/xui/zh/panel_group_general.xml linden/indra/newview/skins/default/xui/zh/panel_group_invite.xml linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml linden/indra/newview/skins/default/xui/zh/panel_group_notices.xml linden/indra/newview/skins/default/xui/zh/panel_group_roles.xml linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml linden/indra/newview/skins/default/xui/zh/strings.xml linden/indra/newview/skins/silver/colors_base.xml linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml linden/indra/newview/viewer_manifest.py linden/install.xml
author: Jacek Antonelli 2009-08-29 17:44:38 -0500
committer: Jacek Antonelli 2009-08-29 22:49:51 -0500
commit: 6a5aab98892df74f60743f5b789959c9593d6647 (patch)
tree: 62da18f8540879ed01e12eeb0ce49375474272e4 /linden/indra/newview/skins/silver/xui/en-us
parent: Merge branch 'mac-openal-url' into next (diff)
parent: Converted 1.23 XUI files to unix line endings. (diff)
download: meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.zip
meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.gz
meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.bz2
meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.xz
3 files changed, 548 insertions, 305 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 bbabfaa..300d7ba 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
@@ -12,180 +12,204 @@
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Name:" v_pad="0" width="72">
+                             mouse_opaque="true" name="Name:" v_pad="0" width="92">
                                Name:
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-20"
                             enabled="true" follows="left|top|right" font="SansSerifSmall"
-                             handle_edit_keys_directly="false" height="16" left="78"
+                             handle_edit_keys_directly="false" height="16" left="98"
                             max_length="63" mouse_opaque="true" name="Name"
                             select_all_on_focus_received="false" select_on_focus="false"
-                             width="368" />
+                             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="16" left="4"
-                             mouse_opaque="true" name="Description:" v_pad="0" width="80">
+                             mouse_opaque="true" name="Description:" v_pad="0" width="100">
                                Description:
                        </text>
                        <text_editor type="string" bevel_style="in" border_style="line" border_thickness="1" bottom="-76"
                             embedded_items="false" enabled="true" follows="left|top|right"
                             font="SansSerifSmall" handle_edit_keys_directly="false" height="52"
-                             left="76" max_length="255" mouse_opaque="true" name="Description"
+                             left="96" max_length="255" mouse_opaque="true" name="Description"
                             select_all_on_focus_received="false" select_on_focus="false"
-                             width="370" word_wrap="true" />
+                             width="350" word_wrap="true" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Owner:" v_pad="0" width="72">
+                             mouse_opaque="true" name="LandType" v_pad="0" width="92">
-                                Owner:
+                                Type:
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="OwnerText" v_pad="0" width="292">
+                             mouse_opaque="true" name="LandTypeText" v_pad="0" width="250">
+                                Mainland / Homestead
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+                             mouse_opaque="true" name="ContentRating" v_pad="0" width="92">
+                                Rating:
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
+                             mouse_opaque="true" name="ContentRatingText" v_pad="0" width="250">
+                                Adult
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+                             mouse_opaque="true" name="Owner:" v_pad="0" width="92">
+                                Owner:
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
+                             mouse_opaque="true" name="OwnerText" v_pad="0" width="250">
                                Leyla Linden
                        </text>
-                        <button bottom="-100" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <button bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
                             halign="center" height="16" label="Profile..." label_selected="Profile..."
                             left="350" mouse_opaque="true" name="Profile..." scale_image="true"
                             width="90" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Group:" v_pad="0" width="72">
+                             mouse_opaque="true" name="Group:" v_pad="0" width="92">
                                Group:
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-122" drop_shadow_visible="true" enabled="false" follows="left|top"
+                             bottom="-162" drop_shadow_visible="true" enabled="false" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="GroupText" v_pad="0" width="110" />
+                             mouse_opaque="true" name="GroupText" v_pad="0" width="250" />
-                        <button bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <button bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
                             halign="center" height="16" label="Set..." label_selected="Set..."
                             left="350" mouse_opaque="true" name="Set..." scale_image="true" width="90" />
-                        <check_box bottom="-140" enabled="false" follows="left|top" font="SansSerifSmall"
+                        <check_box bottom="-180" enabled="false" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Allow Deed to Group" left="76"
+                             height="16" initial_value="false" label="Allow Deed to Group" left="96"
                             mouse_opaque="true" name="check deed" radio_style="false"
                             tool_tip="A group officer can deed this land to the group, so it will be supported by the group&amp;apos;s land allocation."
-                             width="136" />
+                             width="116" />
-                        <button bottom="-140" enabled="false" follows="left|top" font="SansSerifSmall"
+                        <button bottom="-180" enabled="false" follows="left|top" font="SansSerifSmall"
                             halign="center" height="16" label="Deed..." label_selected="Deed..."
                             left="350" mouse_opaque="true" name="Deed..." scale_image="true"
                             tool_tip="You may only deed land if you are an officer in the selected group."
                             width="90" />
-                        <check_box bottom="-160" enabled="false" follows="left|top" font="SansSerifSmall"
+                        <check_box bottom="-200" enabled="false" follows="left|top" font="SansSerifSmall"
                             height="16" initial_value="false"
-                             label="Owner Makes Contribution With Deed" left="76" mouse_opaque="true"
+                             label="Owner Makes Contribution With Deed" left="96" mouse_opaque="true"
                             name="check contrib" radio_style="false"
                             tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."
-                             width="219" />
+                             width="199" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="For Sale:" v_pad="0" width="72">
+                             mouse_opaque="true" name="For Sale:" v_pad="0" width="92">
                                For Sale:
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="Not for sale." v_pad="0" width="206">
+                             mouse_opaque="true" name="Not for sale." v_pad="0" width="186">
                                Not for sale.
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="For Sale: Price L$[PRICE]." v_pad="0" width="206">
+                             mouse_opaque="true" name="For Sale: Price L$[PRICE]." v_pad="0" width="226">
-                                Price: L$[PRICE].
+                                Price: L$[PRICE] (L$[PRICE_PER_SQM]/sq.m.).
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-200" drop_shadow_visible="true" enabled="false" follows="left|top"
+                             bottom="-240" drop_shadow_visible="true" enabled="false" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="SalePending" v_pad="0" width="364" />
+                             mouse_opaque="true" name="SalePending" v_pad="0" width="344" />
-                        <button bottom="-204" enabled="true" follows="left|top" font="SansSerif"
+                        <button bottom="-244" enabled="true" follows="left|top" font="SansSerif"
                             halign="center" height="20" label="Sell Land..."
                             label_selected="Sell Land..." left="295" mouse_opaque="true"
                             name="Sell Land..." scale_image="true" width="145" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-200" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-240" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="For sale to" v_pad="0" width="206">
+                             mouse_opaque="true" name="For sale to" v_pad="0" width="186">
                                For sale to: [BUYER]
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-260" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
                             mouse_opaque="true" name="Sell with landowners objects in parcel."
-                             v_pad="0" width="206">
+                             v_pad="0" width="186">
                                Objects included in sale.
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-260" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
                             mouse_opaque="true" name="Selling with no objects in parcel." v_pad="0"
-                             width="206">
+                             width="186">
                                Objects not included in sale.
                        </text>
-                        <button bottom="-208" enabled="true" follows="left|top" font="SansSerif"
+                        <button bottom="-248" enabled="true" follows="left|top" font="SansSerif"
                             halign="center" height="20" label="Cancel Land Sale"
                             label_selected="Cancel Land Sale" left="295" mouse_opaque="true"
                             name="Cancel Land Sale" scale_image="true" width="145" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-244" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-284" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Claimed:" v_pad="0" width="72">
+                             mouse_opaque="true" name="Claimed:" v_pad="0" width="92">
                                Claimed:
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-244" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-284" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="DateClaimText" v_pad="0" width="206">
+                             mouse_opaque="true" name="DateClaimText" v_pad="0" width="186">
                                Tue Aug 15 13:47:25 2006
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-264" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-304" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="PriceLabel" v_pad="0" width="72">
+                             mouse_opaque="true" name="PriceLabel" v_pad="0" width="92">
                                Area:
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-264" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-304" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="PriceText" v_pad="0" width="206">
+                             mouse_opaque="true" name="PriceText" v_pad="0" width="186">
-                                4048 sq. m.
+                                4048 sq.m.
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-284" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-324" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Traffic:" v_pad="0" width="72">
+                             mouse_opaque="true" name="Traffic:" v_pad="0" width="92">
                                Traffic:
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-284" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-324" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="DwellText" v_pad="0" width="206">
+                             mouse_opaque="true" name="DwellText" v_pad="0" width="186">
                                0
                        </text>
-                        <button bottom="-308" enabled="false" follows="left|top" font="SansSerif"
+                        <button bottom="-348" enabled="false" follows="left|top" font="SansSerif"
                             halign="center" height="20" label="Buy Land..."
                             label_selected="Buy Land..." left="155" mouse_opaque="true"
                             name="Buy Land..." scale_image="true" width="100" />
-                        <button bottom="-332" enabled="false" follows="left|top" font="SansSerif"
+                        <button bottom="-372" enabled="false" follows="left|top" font="SansSerif"
                             halign="center" height="20" label="Buy For Group..."
                             label_selected="Buy For Group..." left="260" mouse_opaque="true"
                             name="Buy For Group..." scale_image="true" width="180" />
-                        <button bottom="-332" enabled="false" follows="left|top" font="SansSerif"
+                        <button bottom="-372" enabled="false" follows="left|top" font="SansSerif"
                             halign="center" height="20" label="Buy Pass..."
                             label_selected="Buy Pass..." left="155" mouse_opaque="true"
                             name="Buy Pass..." scale_image="true"
                             tool_tip="A pass gives you temporary access to this land." width="100" />
-                        <button bottom="-308" enabled="true" follows="left|top" font="SansSerif"
+                        <button bottom="-348" enabled="true" follows="left|top" font="SansSerif"
                             halign="center" height="20" label="Abandon Land..."
                             label_selected="Abandon Land..." left="260" mouse_opaque="true"
                             name="Abandon Land..." scale_image="true" width="180" />
-                        <button bottom="-260" enabled="true" follows="left|top" font="SansSerif"
+                        <button bottom="-300" enabled="true" follows="left|top" font="SansSerif"
                             halign="center" height="20" label="Reclaim Land..."
                             label_selected="Reclaim Land..." left="260" mouse_opaque="true"
                             name="Reclaim Land..." scale_image="true" width="180" />
-                        <button bottom="-284" enabled="false" follows="left|top" font="SansSerif"
+                        <button bottom="-324" enabled="false" follows="left|top" font="SansSerif"
                             halign="center" height="20" label="Linden Sale..."
                             label_selected="Linden Sale..." left="260" mouse_opaque="true"
                             name="Linden Sale..." scale_image="true"
@@ -201,7 +225,7 @@
                                Area
                        </string>
                        <string name="area_size_text">
-                                [AREA] sq. m.
+                                [AREA] sq.m.
                        </string>
                        <string name="auction_id_text">
                                Auction ID: [ID]
@@ -237,64 +261,112 @@ Go to World menu > About Land or select another parcel to show its details.
                     name="land_covenant_panel" width="458">
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="180"
+                             font="SansSerif" h_pad="0" halign="left" height="20" left="5"
+                             mouse_opaque="false" name="estate_section_lbl" v_pad="0" width="100">
+                                Estate:
+                        </text>
+                        <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="20" left="10"
+                             mouse_opaque="false" name="estate_name_lbl" v_pad="0" width="100">
+                                Name:
+                        </text>
+                        <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="20" left="120"
+                             mouse_opaque="false" name="estate_name_text" v_pad="0" width="150">
+                                mainland
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+                             mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
+                                Owner:
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
+                             mouse_opaque="false" name="estate_owner_text" v_pad="0" width="150">
+                                (none)
+                        </text>
+                        <text_editor type="string" length="1" bottom="-175" embedded_items="false" enabled="false"
+                             follows="left|top|right|bottom" font="SansSerifSmall" height="115"
+                             left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"
+                             width="330" word_wrap="true">
+                                There is no Covenant provided for this Estate.
+                        </text_editor>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-250" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
                             mouse_opaque="false" name="covenant_timestamp_text" v_pad="0" width="250">
                                Last Modified Wed Dec 31 16:00:00 1969
                        </text>
                        <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"
+                             bottom="-270" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerif" h_pad="0" halign="left" height="20" left="5"
+                             mouse_opaque="false" name="region_section_lbl" v_pad="0" width="100">
+                                Region:
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-290" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
                             mouse_opaque="false" name="region_name_lbl" v_pad="0" width="100">
-                                Region:
+                                Name:
                        </text>
                        <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"
+                             bottom="-290" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
                             mouse_opaque="false" name="region_name_text" v_pad="0" width="150">
                                leyla
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-310" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="false" name="estate_name_lbl" v_pad="0" width="100">
+                             mouse_opaque="false" name="region_landtype_lbl" v_pad="0" width="100">
-                                Estate:
+                                Type:
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-310" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-                             mouse_opaque="false" name="estate_name_text" v_pad="0" width="150">
+                             mouse_opaque="false" name="region_landtype_text" v_pad="0" width="150">
-                                mainland
+                                Mainland / Homestead
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-330" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
+                             mouse_opaque="false" name="region_maturity_lbl" v_pad="0" width="100">
-                                Estate Owner:
+                                Rating:
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-330" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-                             mouse_opaque="false" name="estate_owner_text" v_pad="0" width="150">
+                             mouse_opaque="false" name="region_maturity_text" v_pad="0" width="150">
-                                (none)
+                                Adult
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-350" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerif" h_pad="0" halign="left" height="20" left="05"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="false" name="resellable_clause" v_pad="0" width="485">
+                             mouse_opaque="false" name="resellable_lbl" v_pad="0" width="100">
-                                Purchased land in this region may not be resold.
+                                Resale:
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             bottom="-350" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerif" h_pad="0" halign="left" height="20" left="05"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-                             mouse_opaque="false" name="changeable_clause" v_pad="0" width="485">
+                             mouse_opaque="false" name="resellable_clause" v_pad="0" width="330">
-                                Purchased land in this region may not be joined/subdivided.
+                                Land in this region may not be resold.
-                        </text>
+                        </text>
-                        <text_editor type="string" length="1" bottom="-325" embedded_items="false" enabled="false"
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             follows="left|top|right|bottom" font="SansSerifSmall" height="200"
+                             bottom="-370" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             left="15" max_length="65535" mouse_opaque="true" name="covenant_editor"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             width="420" word_wrap="true">
+                             mouse_opaque="false" name="changeable_lbl" v_pad="0" width="100">
-                                There is no Covenant provided for this Estate.
+                                Subdivide:
-                        </text_editor>
+                        </text>
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-380" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="30" left="120"
+                             mouse_opaque="false" name="changeable_clause" v_pad="0" width="330">
+                                Land in this region may not be joined/subdivided.
+                        </text>
                        <string name="can_resell">
                                Purchased land in this region may be resold.
                        </string>
@@ -467,7 +539,7 @@ Go to World menu > About Land or select another parcel to show its details.
                                <column name="online_status" width="-1" />
                                <column name="name" dynamicwidth="true" label="Name" />
                                <column name="count" label="Count" width="70" />
-                                <column label="Most Recent" width="160" />
+                                <column name="mostrecent" label="Most Recent" width="160" />
                        </name_list>
                </panel>
                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
@@ -555,9 +627,19 @@ Go to World menu > About Land or select another parcel to show its details.
                             label="Show Place in Search (L$30/week) under" left="14"
                             mouse_opaque="true" name="ShowDirectoryCheck" radio_style="false"
                             tool_tip="Let people see this parcel in search results" width="268" />
-                        <combo_box allow_text_entry="false" bottom="-140" enabled="true" follows="left|top"
+                        <string name="search_enabled_tooltip">
+                                Let people see this parcel in search results
+                        </string>
+                        <string name="search_disabled_small_tooltip">
+                                This option is disabled because this parcel&apos;s area is 128 sq.m. or smaller.
+Only large parcels can be listed in search.
+                        </string>
+                        <string name="search_disabled_permissions_tooltip">
+                                This option is disabled because you cannot modify this parcel&apos;s options.
+                        </string>
+                        <combo_box allow_text_entry="false" bottom="-140" enabled="false" follows="left|top"
                             height="18" left="255" max_chars="20" mouse_opaque="true"
-                             name="land category" width="130">
+                             name="land category with adult" width="130" visible="false">
                                <combo_item name="AnyCategory" value="any">
                                        Any Category
                                </combo_item>
@@ -598,14 +680,70 @@ Go to World menu > About Land or select another parcel to show its details.
                                        Other
                                </combo_item>
                        </combo_box>
+                        <!-- The following combo box is identical to the previous one, except for the
+                        fact that the Adult item is missing. This seems to be the only way to safely
+                        delete the adult item with our UI toolkit.
+                        Once we have completed the transition period, the one WITH adult can be deleted. -->
+                        <combo_box allow_text_entry="false" bottom="-140" enabled="false" follows="left|top"
+                             height="18" left="255" max_chars="20" mouse_opaque="true"
+                             name="land category" width="130" visible="false">
+                                <combo_item name="AnyCategory" value="any">
+                                        Any Category
+                                </combo_item>
+                                <combo_item name="LindenLocation" value="linden">
+                                        Linden Location
+                                </combo_item>
+                                <combo_item name="Arts&amp;Culture" value="arts">
+                                        Arts &amp; Culture
+                                </combo_item>
+                                <combo_item name="Business" value="store">
+                                        Business
+                                </combo_item>
+                                <combo_item name="Educational" value="educational">
+                                        Educational
+                                </combo_item>
+                                <combo_item name="Gaming" value="game">
+                                        Gaming
+                                </combo_item>
+                                <combo_item name="Hangout" value="gather">
+                                        Hangout
+                                </combo_item>
+                                <combo_item name="NewcomerFriendly" value="newcomer">
+                                        Newcomer Friendly
+                                </combo_item>
+                                <combo_item name="Parks&amp;Nature" value="park">
+                                        Parks &amp; Nature
+                                </combo_item>
+                                <combo_item name="Residential" value="home">
+                                        Residential
+                                </combo_item>
+                                <combo_item name="Shopping" value="shopping">
+                                        Shopping
+                                </combo_item>
+                                <combo_item name="Other" value="other">
+                                        Other
+                                </combo_item>
+                        </combo_box>
                        <button bottom="-140" enabled="true" follows="left|top" font="SansSerif"
                             halign="center" height="16" label="?" label_selected="?" left="400"
                             mouse_opaque="true" name="?" width="20" />
                        <check_box bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
                             height="16" initial_value="false" label="Mature Content" left="14"
                             mouse_opaque="true" name="MatureCheck" radio_style="false"
-                             tool_tip="Your parcel information or content is considered mature."
+                             tool_tip=" "
                             width="107" />
+                        <string name="mature_check_mature">
+                                Mature Content
+                        </string>
+                        <string name="mature_check_adult">
+                                Adult Content
+                        </string>
+                        <string name="mature_check_mature_tooltip">
+                                Your parcel information or content is considered mature.
+                        </string>
+                        <string name="mature_check_adult_tooltip">
+                                Your parcel information or content is considered adult.
+                        </string>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
@@ -772,31 +910,33 @@ Options:
                        </text>
                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
                             height="16" initial_value="false"
-                             label="Restrict spatialized sound to this parcel" left="80"
+                             label="Restrict gesture and object sounds to this parcel" left="80"
                             mouse_opaque="true" name="check sound local" radio_style="false"
                             width="292" />
+                        <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
+                             halign="center" height="18" label="?" label_selected="?" left="372"
+                             mouse_opaque="true" name="?" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-40" enabled="true" follows="left|top" font="SansSerifSmall"
                             h_pad="0" halign="left" height="16" left="10" mouse_opaque="false"
                             name="Voice settings:" tab_stop="false" v_pad="0" width="364">
                                Voice:
                        </text>
-                        <radio_group bottom_delta="-40" draw_border="true" enabled="true" follows="left|top"
+                        <check_box bottom_delta="-0" enabled="true" follows="left|top"
-                             height="54" left="80" mouse_opaque="true" name="parcel_voice_channel"
+                             height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel"
-                             tab_stop="true" width="219">
+                             tab_stop="true" width="463"
-                                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="3"
+                             label="Enable Voice"
-                                     mouse_opaque="true" name="Estate" width="463">
+                        />
-                                        Use the Estate spatial channel
+                        <check_box bottom_delta="-0" enabled="false" follows="left|top"
-                                </radio_item>
+                             height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel_is_estate_disabled"
-                                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" left="3"
+                             tab_stop="true" width="463"
-                                     mouse_opaque="true" name="Private" width="463">
+                             label="Enable Voice (established by the Estate)"
-                                        Use a private spatial channel
+                        />
-                                </radio_item>
+                        <check_box bottom_delta="-20" enabled="true" follows="left|top"
-                                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" left="3"
+                             height="54" left="100" mouse_opaque="true" name="parcel_enable_voice_channel_parcel"
-                                     mouse_opaque="true" name="Disabled" width="463">
+                             tab_stop="true" width="443"
-                                        Disable spatial audio on this parcel
+                             label="Restrict Voice to this parcel"
-                                </radio_item>
+                        />
-                        </radio_group>
                </panel>
                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                     height="333" label="Access" left="1" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
index 4511d1b..af8db95 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="570" min_height="570" min_width="780"
+     can_resize="true" height="570" min_height="570" min_width="780"
     name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
     width="780">
        <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
@@ -13,22 +13,28 @@
                        <string name="not_found_text">
                                None Found.
                        </string>
-                        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="20" label="Back"
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             left="10" name="back_btn" width="70" />
+                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
+                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-                             label="Forward" left_delta="75" name="forward_btn" width="70" />
+                             name="find" v_pad="0" width="50">
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+                                Find:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                             commit_on_focus_lost="false" enabled="true" follows="top|left|right"
-                             font="SansSerif" handle_edit_keys_directly="false" height="20"
+                             font="SansSerif" handle_edit_keys_directly="false" height="18"
-                             label="Search" left_delta="80" max_length="254" mouse_opaque="true"
+                             label="Search" left_delta="56" max_length="254" mouse_opaque="true"
                             name="search_editor" select_all_on_focus_received="false"
                             select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
-                             width="180" />
+                             width="160" />
-                        <button bottom_delta="0" follows="top|right" font="SansSerif" height="20"
+                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
-                             label="Search" left_delta="185" name="search_btn" width="70" />
+                             left="230" name="back_btn" width="70" />
-                        <combo_box allow_text_entry="false" bottom_delta="0" follows="right|top" height="18"
+                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-                             left_delta="100" max_chars="20" mouse_opaque="true" name="Category"
+                             label="Forward" left="304" name="forward_btn" width="70" />
-                             width="128">
+                        <button bottom="-48" follows="top|right" font="SansSerif" height="20"
+                             label="Search" left="121" name="search_btn" width="95" />
+                        <combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18"
+                             left="230" max_chars="20" mouse_opaque="true" name="Category"
+                             width="158">
                                <combo_item name="AnyCategory" value="All">
                                        Any Category
                                </combo_item>
@@ -48,12 +54,23 @@
                                        Wiki
                                </combo_item>
                        </combo_box>
-                        <check_box bottom_delta="0" control_name="ShowMatureFindAll" follows="right|top"
+                        <check_box bottom="-22" control_name="ShowPGSearchAll" follows="right|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="PG content" left="420" mouse_opaque="true"
+                             name="incpg" width="156" />
+                        <check_box bottom="-40" control_name="ShowMatureSearchAll" follows="right|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="Mature content" left="420" mouse_opaque="true"
+                             name="incmature" width="156" />
+                        <check_box bottom="-58" control_name="ShowAdultSearchAll" follows="right|top"
                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Include Mature content" left_delta="133" name="mature_check"
+                             label="Adult content" left="420" mouse_opaque="true"
-                             width="156" />
+                             name="incadult" width="156" />
+                        <button bottom="-22" enabled="true" follows="right|top" font="SansSerif"
+                             halign="center" height="18" label="?" label_selected="?" left="-25"
+                             mouse_opaque="true" name="?" width="18" />
                        <web_browser bottom="25" follows="top|left|bottom|right" font="SansSerifSmall" left="10"
-                             name="find_browser" right="-10" top="-40" />
+                             name="find_browser" right="-10" top="-60" />
                        <text bottom="5" follows="bottom|left" halign="left" height="16" left="10"
                             name="status_text" width="150" />
                        <string name="loading_text">
@@ -70,18 +87,12 @@
                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                     label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
                     name="classified_panel" width="778">
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Next &gt;" label_selected="Next &gt;"
-                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
                        <string name="searching_text">
                                Searching...
                        </string>
                        <string name="not_found_text">
                                None Found.
                        </string>
-                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
-                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
@@ -89,14 +100,22 @@
                                Find:
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-                             follows="left|top" font="SansSerif" height="18" left_delta="38"
+                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="128" />
+                             max_length="63" mouse_opaque="true" name="name" width="160" />
-                        <check_box bottom_delta="-18" control_name="ShowMatureClassifieds" follows="left|top"
+                        <check_box bottom="-22" control_name="ShowPGClassifieds" follows="right|top"
                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Include Mature content" left_delta="0" mouse_opaque="true"
+                             label="PG content" left="420" mouse_opaque="true"
+                             name="incpg" width="156" />
+                        <check_box bottom="-40" control_name="ShowMatureClassifieds" follows="right|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="Mature content" left="420" mouse_opaque="true"
                             name="incmature" width="156" />
-                        <combo_box allow_text_entry="false" bottom="-24" follows="left|top" height="18" left="182"
+                        <check_box bottom="-58" control_name="ShowAdultClassifieds" follows="right|top"
-                             max_chars="20" mouse_opaque="true" name="Category" width="128">
+                             font="SansSerifSmall" height="16" initial_value="false"
+                             label="Adult content" left="420" mouse_opaque="true"
+                             name="incadult" width="156" />
+                        <combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
+                             max_chars="20" mouse_opaque="true" name="Category" width="158">
                                <combo_item name="AnyCategory" value="0">
                                        Any Category
                                </combo_item>
@@ -128,20 +147,21 @@
                                        Personal
                                </combo_item>
                        </combo_box>
-                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                        <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Browse" label_selected="Browse" left_delta="142" mouse_opaque="true"
+                             label="Browse" label_selected="Browse" left="121" mouse_opaque="true"
-                             name="Browse" width="85" />
+                             name="Browse" width="95" />
-                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                        <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" mouse_opaque="true" name="Search"
+                             label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
-                             visible="false" width="70" />
+                             visible="false" width="95" />
-                        <button bottom="-26" follows="right|top" font="SansSerif" halign="center" height="20"
+                        <button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Place an Ad..." label_selected="Place an Ad..." left="-140"
+                             label="Place an Ad..." label_selected="Place an Ad..." left="630"
-                             mouse_opaque="true" name="Place an Ad..." width="125" />
+                             mouse_opaque="true" name="Place an Ad..." width="145" />
                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                             height="20" label="Delete" label_selected="Delete" left="80"
                             mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true"                       follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" 
-                             multi_select="false" name="results" search_column="2" width="339">
+                                 draw_heading="true" follows="left|top|right|bottom" height="450" left="4" 
+                                 mouse_opaque="true" multi_select="false" name="results" search_column="2" width="339">
                                <column label="" name="icon" width="24" />
                                <column label="" name="type" width="-1" />
                                <column label="Name" name="name" width="225" />
@@ -150,7 +170,13 @@
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+                             mouse_opaque="true" name="result_text" v_pad="0" width="80" />
+                        <button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
+                             height="20" label="Next &gt;" label_selected="Next &gt;"
+                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+                        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
+                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                </panel>
                <panel border="true" bottom="-549" default_tab_group="1"
                     follows="left|top|right|bottom" height="533" label="Events" left="1"
@@ -161,7 +187,16 @@
                        <string name="not_found_text">
                                None Found.
                        </string>
-                        <radio_group bottom="-40" draw_border="false" follows="left|top" height="40" left="4"
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+                             name="text2" v_pad="0" width="50">
+                                Find:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+                             follows="left|right|top" font="SansSerif" height="18" left="56"
+                             max_length="63" mouse_opaque="true" name="event_search_text" width="160" />
+                        <radio_group bottom="-40" draw_border="false" follows="right|top" height="40" left="560"
                             mouse_opaque="true" name="date_mode" width="300">
                                <radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
                                     name="current" width="174">
@@ -172,37 +207,31 @@
                                        Date
                                </radio_item>
                        </radio_group>
-                        <button bottom="-40" follows="left|top" font="SansSerif" halign="center" height="20"
+                        <button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
                             label="&lt;&lt;" label_selected="&lt;&lt;" left_delta="54"
-                             mouse_opaque="true" name="&lt;&lt;" tool_tip="Go back a day" width="36" />
+                             mouse_opaque="true" name="&lt;&lt;" tool_tip="Go back a day" width="24" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-36" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+                             bottom="-36" drop_shadow_visible="true" follows="right|top" font="SansSerif"
-                             h_pad="0" halign="center" height="14" left_delta="40" mouse_opaque="true"
+                             h_pad="0" halign="center" height="14" left_delta="22" mouse_opaque="true"
                             name="date_text" v_pad="0" width="48">
                                6/6
                        </text>
-                        <button bottom="-40" follows="left|top" font="SansSerif" halign="center" height="20"
+                        <button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="&gt;&gt;" label_selected="&gt;&gt;" left_delta="52"
+                             label="&gt;&gt;" label_selected="&gt;&gt;" left_delta="50"
-                             mouse_opaque="true" name="&gt;&gt;" tool_tip="Go forward a day" width="36" />
+                             mouse_opaque="true" name="&gt;&gt;" tool_tip="Go forward a day" width="24" />
-                        <button bottom="-40" follows="left|top" font="SansSerif" halign="center" height="20"
+                        <button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Today" label_selected="Today" left_delta="48" mouse_opaque="true"
+                             label="Today" label_selected="Today" left_delta="28" mouse_opaque="true"
-                             name="Today" tool_tip="Show today&apos;s events" width="80" />
+                             name="Today" tool_tip="Show today&apos;s events" width="60" />
                        <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="20" left="289"
-                             mouse_opaque="true" name="text" v_pad="0" width="90">
+                             mouse_opaque="true" name="text" v_pad="0" width="90" visible="false">
                                Category:
                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                        <combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+                             max_chars="20" mouse_opaque="true" name="category combo" width="158">
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
-                             mouse_opaque="true" name="text2" v_pad="0" width="90">
-                                Name/Desc:
-                        </text>
-                        <combo_box allow_text_entry="false" bottom="-22" follows="left|top" height="18" left="379"
-                             max_chars="20" mouse_opaque="true" name="category combo" width="180">
                                <combo_item name="All" value="0">
-                                        All
+                                        Any Category
                                </combo_item>
                                <combo_item name="Discussion" value="18">
                                        Discussion
@@ -238,21 +267,26 @@
                                        Miscellaneous
                                </combo_item>
                        </combo_box>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20"
+                        <check_box bottom="-22" control_name="ShowPGEvents" follows="right|top"
-                             follows="left|top" font="SansSerifSmall" height="18" left="379"
+                             font="SansSerifSmall" height="16" initial_value="true"
-                             max_length="32" mouse_opaque="true" name="event_search_text" tab_group="1"
+                             label="PG content" left="420" mouse_opaque="true"
-                             width="180" />
+                             name="incpg" width="156" />
-                        <check_box bottom="-30" control_name="ShowMatureEvents" follows="left|top"
+                        <check_box bottom="-40" control_name="ShowMatureEvents" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="false" label="Show Mature"
+                             font="SansSerifSmall" height="16" initial_value="true"
-                             left="569" mouse_opaque="true" name="incmature" width="120" />
+                             label="Mature content" left="420" mouse_opaque="true"
-                        <button bottom="-28" follows="left|top" font="SansSerif" halign="center" height="20"
+                             name="incmature" width="156" />
-                             label="Search" label_selected="Search" left_delta="110" mouse_opaque="true"
+                        <check_box bottom="-58" control_name="ShowAdultEvents" follows="right|top"
-                             name="Search" tool_tip="Search" width="80" />
+                             font="SansSerifSmall" height="16" initial_value="false"
+                             label="Adult content" left="420" mouse_opaque="true"
+                             name="incadult" width="156" />
+                        <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+                             label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
+                             visible="true" width="95" />
                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                             height="20" label="Delete" label_selected="Delete" left="80"
                             mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
+                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="2" width="339">
                                <column label="" name="icon" width="24" />
                                <column label="" name="type" width="-1" />
@@ -264,11 +298,11 @@
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+                             mouse_opaque="true" name="result_text" v_pad="0" width="80" />
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+                        <button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
                             height="20" label="Next &gt;" label_selected="Next &gt;"
                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+                        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                </panel>
@@ -306,21 +340,37 @@
    </panel>
                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                     label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
-                     width="778">
+                     width="778" default_tab_group="1">
                        <string name="searching_text">
                                Searching...
                        </string>
                        <string name="not_found_text">
                                None Found.
                        </string>
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+                        <string name="land_help_text">
-                             height="20" label="Next &gt;" label_selected="Next &gt;"
+                                Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
-                             mouse_opaque="true" name="Next &gt;" right="390" width="80" />
+To buy direct, visit the land and click on the place name in the title bar.
-                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+                        </string>
-                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             mouse_opaque="true" name="&lt; Prev" right="304" width="80" />
+                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                        <combo_box allow_text_entry="false" bottom="-22" follows="left|top" height="18" left="4"
+                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-                             max_chars="20" mouse_opaque="true" name="type" width="125">
+                             name="find" v_pad="0" width="50">
+                                Find:
+                        </text>
+                        <check_box bottom="-22" control_name="ShowPGLand" follows="right|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="PG content" left="420" mouse_opaque="true"
+                             name="incpg" tab_group="7" width="156" />
+                        <check_box bottom="-40" control_name="ShowMatureLand" follows="right|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="Mature content" left="420" mouse_opaque="true"
+                             name="incmature" tab_group="8" width="156" />
+                        <check_box bottom="-58" control_name="ShowAdultLand" follows="right|top"
+                             font="SansSerifSmall" height="16" initial_value="false"
+                             label="Adult content" left="420" mouse_opaque="true"
+                             name="incadult" tab_group="9" width="156" />
+                        <combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
+                             max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
                                <combo_item name="AllTypes" value="All Types">
                                        All Types
                                </combo_item>
@@ -334,58 +384,55 @@
                                        For Sale - Estate
                                </combo_item>
                        </combo_box>
-                        <combo_box allow_text_entry="false" bottom_delta="-18" follows="left|top" height="18"
+                        <check_box bottom="-24" control_name="FindLandPrice" follows="left|top"
-                             left="4" max_chars="20" mouse_opaque="true" name="rating" width="125">
-                                <combo_item name="PG&amp;Mature" value="PG &amp; Mature">
-                                        PG &amp; Mature
-                                </combo_item>
-                                <combo_item name="PGonly" value="PG only">
-                                        PG only
-                                </combo_item>
-                                <combo_item name="Matureonly" value="Mature only">
-                                        Mature only
-                                </combo_item>
-                        </combo_box>
-                        <check_box bottom="-22" control_name="FindLandPrice" follows="left|top"
                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Price &lt;= L$" left="132" mouse_opaque="true" name="pricecheck"
+                             label="Price &#8804; " left="56" mouse_opaque="true" name="pricecheck"
-                             width="88" />
+                             tab_group="1" width="88" />
-                        <check_box bottom_delta="-16" control_name="FindLandArea" follows="left|top"
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
+                             bottom="-24" font="SansSerifSmall" halign="left" height="16" left="116" mouse_opaque="true"
+                             name="pricecheck_symbol" width="15">
+                                L$
+                        </text>
+                        <check_box bottom_delta="-18" control_name="FindLandArea" follows="left|top"
                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Area &gt;= sq.m." left="132" mouse_opaque="true" name="areacheck"
+                             label="Area &#8805; " left="56" mouse_opaque="true" name="areacheck"
-                             width="102" />
+                             tab_group="3" width="80" />
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
-                             follows="left|top" font="SansSerifSmall" height="16" left="221"
+                             bottom="-42" font="SansSerifSmall" halign="left" height="16" left="170" mouse_opaque="true"
-                             max_length="10" mouse_opaque="true" name="priceedit" width="50" />
+                             name="areacheck_symbol" width="15">
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-16"
+                                m²
-                             follows="left|top" font="SansSerifSmall" height="16" left="221"
-                             max_length="10" mouse_opaque="true" name="areaedit" width="50" />
-                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left="278" mouse_opaque="true"
-                             name="Search" width="70" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-38" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="32" left="354"
-                             mouse_opaque="true" name="land" v_pad="0" width="430">
-                                Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
-To buy direct, visit the land and click on the place name in the title bar.
                        </text>
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                             follows="left|top" font="SansSerifSmall" height="16" left="132"
-                             multi_select="false" name="results" search_column="2" width="387">
+                             max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" />
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
+                             follows="left|top" font="SansSerifSmall" height="16" left="117"
+                             max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" />
+                        <button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
+                             label="Search" label_selected="Search" left="208" mouse_opaque="true"
+                             name="Search" tab_group="5" width="70" />
+                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
+                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+                             multi_select="false" name="results" search_column="2" tab_group="10" width="387">
                                <column label="" name="icon" width="24" />
                                <column label="" name="type" width="-1" />
                                <column dynamicwidth="true" label="Name" name="name" />
+                                <column label="Type" name="landtype" width="50" />
                                <column label="L$ Price" name="price" width="65" />
                                <column label="Area" name="area" width="50" />
-                                <column label="L$/sq.m" name="per_meter" width="65" />
+                                <column label="L$/m²" name="per_meter" width="65" />
                        </scroll_list>
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+                        <button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
+                             height="20" label="Next &gt;" label_selected="Next &gt;"
+                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+                        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
+                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                </panel>
-                
                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                     label="Places" left="1" mouse_opaque="false" name="places_panel"
                     width="778">
@@ -395,12 +442,6 @@ To buy direct, visit the land and click on the place name in the title bar.
                        <string name="not_found_text">
                                None Found.
                        </string>
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Next &gt;" label_selected="Next &gt;"
-                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
-                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
@@ -408,14 +449,64 @@ To buy direct, visit the land and click on the place name in the title bar.
                                Find:
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-                             follows="left|top" font="SansSerif" height="18" left_delta="38"
+                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="128" />
+                             max_length="63" mouse_opaque="true" name="name" width="160" />
-                        <check_box bottom_delta="-18" control_name="ShowMatureSims" follows="left|top"
+                        <check_box bottom="-22" control_name="ShowPGSims" follows="right|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="PG content" left="420" mouse_opaque="true"
+                             name="incpg" width="156" />
+                        <check_box bottom="-40" control_name="ShowMatureSims" follows="right|top"
+                             font="SansSerifSmall" height="16" initial_value="true"
+                             label="Mature content" left="420" mouse_opaque="true"
+                             name="incmature" width="156" />
+                        <check_box bottom="-58" control_name="ShowAdultSims" follows="right|top"
                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Include parcels with Mature content" left_delta="0"
+                             label="Adult content" left="420" mouse_opaque="true"
-                             mouse_opaque="true" name="incmature" width="204" />
+                             name="incadult" width="156" />
-                        <combo_box allow_text_entry="false" bottom="-24" follows="left|top" height="18" left="182"
+                        <combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
-                             max_chars="20" mouse_opaque="true" name="Category" width="128">
+                             max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
+                                <combo_item name="AnyCategory" value="any">
+                                        Any Category
+                                </combo_item>
+                                <combo_item name="LindenLocation" value="linden">
+                                        Linden Location
+                                </combo_item>
+                                <combo_item name="Arts&amp;Culture" value="arts">
+                                        Arts &amp; Culture
+                                </combo_item>
+                                <combo_item name="Business" value="store">
+                                        Business
+                                </combo_item>
+                                <combo_item name="Educational" value="educational">
+                                        Educational
+                                </combo_item>
+                                <combo_item name="Gaming" value="game">
+                                        Gaming
+                                </combo_item>
+                                <combo_item name="Hangout" value="gather">
+                                        Hangout
+                                </combo_item>
+                                <combo_item name="NewcomerFriendly" value="newcomer">
+                                        Newcomer Friendly
+                                </combo_item>
+                                <combo_item name="Parks&amp;Nature" value="park">
+                                        Parks &amp; Nature
+                                </combo_item>
+                                <combo_item name="Residential" value="home">
+                                        Residential
+                                </combo_item>
+                                <combo_item name="Shopping" value="shopping">
+                                        Shopping
+                                </combo_item>
+                                <combo_item name="Other" value="other">
+                                        Other
+                                </combo_item>
+                        </combo_box>
+                        <!-- This is used only during the AO transition and can be deleted once the AO transition is
+                        complete. It is identical to the combo box above except that it has the Adult category. 
+                        You might also want to set it back to default visible and enabled. -->
+                        <combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
+                             max_chars="20" mouse_opaque="true" name="Category_Adult" width="128" visible="false">
                                <combo_item name="AnyCategory" value="any">
                                        Any Category
                                </combo_item>
@@ -456,12 +547,13 @@ To buy direct, visit the land and click on the place name in the title bar.
                                        Other
                                </combo_item>
                        </combo_box>
-                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                        <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
+                             label="Search" label_selected="Search" left="121" mouse_opaque="true"
-                             name="Search" width="70" />
+                             name="Search" width="95" />
-                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
                             draw_heading="true" 
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                             
+                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="2" width="339">
                                <column label="" name="icon" width="24" />
                                <column label="" name="type" width="-1" />
@@ -472,8 +564,13 @@ To buy direct, visit the land and click on the place name in the title bar.
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="Next &gt;" label_selected="Next &gt;"
+                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
+                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                </panel>
-                
    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                     label="People" left="1" mouse_opaque="false" name="people_panel"
                     width="778">
@@ -483,12 +580,6 @@ To buy direct, visit the land and click on the place name in the title bar.
                        <string name="not_found_text">
                                None Found.
                        </string>
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Next &gt;" label_selected="Next &gt;"
-                             mouse_opaque="true" name="Next &gt;" right="330" width="80" />
-      <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
-                             mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
@@ -496,14 +587,15 @@ To buy direct, visit the land and click on the place name in the title bar.
        Find:
      </text>
      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-                             follows="left|top" font="SansSerif" height="18" left_delta="38"
+                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="200" />
+                             max_length="63" mouse_opaque="true" name="name" width="160" />
-      <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
+                             label="Search" label_selected="Search" left="121" mouse_opaque="true"
-                             name="Search" width="70" />
+                             name="Search" width="95" />
-      <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+      <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
                             draw_heading="true"
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                               
+                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="2" width="326">
        <column label="" name="icon" width="24" />
        <column label="" name="type" width="-1" />
@@ -513,6 +605,12 @@ To buy direct, visit the land and click on the place name in the title bar.
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="Next &gt;" label_selected="Next &gt;"
+                             mouse_opaque="true" name="Next &gt;" right="330" width="80" />
+                <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
+                             mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
                </panel>
    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                     label="Groups" left="1" mouse_opaque="false"
@@ -520,27 +618,26 @@ To buy direct, visit the land and click on the place name in the title bar.
                     width="778">
      <string name="searching_text">Searching...</string>
      <string name="not_found_text">None Found.</string>
-      <button bottom="-30" follows="top|left" font="SansSerifSmall" height="20"
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                label="Back"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                                left="10"
+                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-                                name="back_btn" width="70" />
+                             name="find" v_pad="0" width="50">
-      <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
+                                Find:
-                                label="Forward" left_delta="75"
+                        </text>
-                                name="forward_btn" width="70" />
      <line_editor bevel_style="in"
                                                border_style="line"
                                                border_thickness="1"
-                                                bottom_delta="0"
+                                                bottom="-24"
                                                enabled="true"
                                                follows="top|left|right"
                                                font="SansSerif"
                                                handle_edit_keys_directly="false"
                                                commit_on_focus_lost="false"
-                                                height="20"
+                                                height="18"
                                                hidden="false"
                                                label="Search"
-                                                left_delta="80"
+                                                left_delta="56"
-                                                width="180"
+                                                width="160"
                                                max_length="254"
                                                mouse_opaque="true"
                                                name="search_editor"
@@ -548,25 +645,31 @@ To buy direct, visit the land and click on the place name in the title bar.
                                                select_on_focus="false"
                                                tab_group="1"
                                                tool_tip="Search Second Life" />
-      <button follows="top|right" font="SansSerif" height="20"
+                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
-                                label="Search"
+                             left="230" name="back_btn" width="70" />
-                                left_delta="185"
+                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-                                bottom_delta="0"
+                             label="Forward" left="304" name="forward_btn" width="70" />
-                                name="search_btn" width="70" />
+                        <button bottom="-48" follows="top|right" font="SansSerif" height="20"
-      <check_box bottom_delta="0"
+                             label="Search" left="121" name="search_btn" width="95" />
-                                control_name="ShowMatureFindAll" follows="right|top"
+          <check_box bottom="-22" control_name="ShowPGGroups" follows="right|top"
+                     font="SansSerifSmall" height="16" initial_value="true"
+                     label="PG content" left="420" mouse_opaque="true"
+                     name="incpg" width="156" />
+          <check_box bottom="-40" control_name="ShowMatureGroups" follows="right|top"
+                     font="SansSerifSmall" height="16" initial_value="true"
+                     label="Mature content" left="420" mouse_opaque="true"
+                     name="incmature" width="156" />
+          <check_box bottom="-58" control_name="ShowAdultGroups" follows="right|top"
                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Include Mature content"
+                     label="Adult content" left="420" mouse_opaque="true"
-                             left_delta="133"
+                     name="incadult" width="156" />
-                             name="mature_check"
-                             width="156" />
      <web_browser name="groups_browser"
                                bottom="25"
                                follows="top|left|bottom|right"
                                font="SansSerifSmall"
                                left="10"
                                right="-10"
-                                top="-40" />
+                                top="-60" />
      <text bottom="5"
                                follows="bottom|left"
                                halign="left"
@@ -591,8 +694,8 @@ To buy direct, visit the land and click on the place name in the title bar.
                <panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
                     width="430" />
        </panel>
-        <panel bottom="20" follows="right|top" height="470" left="340"
+        <panel bottom="5" follows="right|top" height="470" left="340"
             name="place_details_panel" width="440" />
-        <panel bottom="20" follows="right|top" height="470" left="385"
+        <panel bottom="0" follows="right|top" height="470" left="385"
             name="place_details_small_panel" width="395" />
 </floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
index 466db79..0567388 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
@@ -25,7 +25,7 @@
  <icon bottom="-18" enabled="true" follows="left|top" height="14"
             image_name="icn_label_media.tga"
             label="" left_delta="22" mouse_opaque="true"
-             name="media_icon" scale_image="true" tool_tip="Play/pause streaming media"
+             name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"
             width="17" />
  <button bottom="-21" enabled="true" follows="left|top" height="20"
             image_overlay="icn_play.tga"
author	Jacek Antonelli	2009-08-29 17:44:38 -0500
committer	Jacek Antonelli	2009-08-29 22:49:51 -0500
commit	6a5aab98892df74f60743f5b789959c9593d6647 (patch)
tree	62da18f8540879ed01e12eeb0ce49375474272e4 /linden/indra/newview/skins/silver/xui/en-us
parent	Merge branch 'mac-openal-url' into next (diff)
parent	Converted 1.23 XUI files to unix line endings. (diff)
download	meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.zip meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.gz meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.bz2 meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.xz