From c206147ceffd6836bf0f6fe50d0ae4de77c7dcba Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:45:13 -0500 Subject: Second Life viewer sources 1.18.4.1-RC --- linden/indra/llcommon/llversionviewer.h | 2 +- linden/indra/llvfs/lldir_win32.cpp | 1 + .../indra/newview/English.lproj/InfoPlist.strings | 4 +- linden/indra/newview/Info-SecondLife.plist | 2 +- linden/indra/newview/llfloaterlandholdings.cpp | 17 +- linden/indra/newview/llfloaterregioninfo.cpp | 3 +- linden/indra/newview/llpanelclassified.cpp | 14 +- linden/indra/newview/llpanelface.cpp | 2 +- linden/indra/newview/llpanelgroupgeneral.cpp | 4 +- linden/indra/newview/llpanelgrouplandmoney.cpp | 2 +- linden/indra/newview/llpanelpermissions.cpp | 2 +- linden/indra/newview/llselectmgr.cpp | 38 +- linden/indra/newview/llselectmgr.h | 12 + linden/indra/newview/llsrv.cpp | 17 +- linden/indra/newview/lltooldraganddrop.cpp | 83 +- linden/indra/newview/lluserauth.cpp | 13 +- linden/indra/newview/llworldmapview.cpp | 1 + linden/indra/newview/newview_vc8.vcproj | 36 +- linden/indra/newview/releasenotes.txt | 14 + linden/indra/newview/res/newViewRes.rc | 8 +- .../skins/xui/de/floater_active_speakers.xml | 5 +- .../skins/xui/de/floater_animation_preview.xml | 10 +- .../newview/skins/xui/de/floater_buy_land.xml | 8 +- .../skins/xui/de/floater_new_outfit_dialog.xml | 102 +- .../indra/newview/skins/xui/de/floater_tools.xml | 89 +- linden/indra/newview/skins/xui/de/need_to_long.xml | 160 - .../newview/skins/xui/de/need_to_translate.xml | 2356 --------- .../indra/newview/skins/xui/de/need_to_update.xml | 475 -- .../newview/skins/xui/de/panel_avatar_pick.xml | 4 +- .../newview/skins/xui/de/panel_group_notices.xml | 13 +- .../skins/xui/de/panel_preferences_chat.xml | 15 +- .../newview/skins/xui/de/panel_voice_remote.xml | 6 +- linden/indra/newview/skins/xui/de/untranslated.xml | Bin 344459 -> 0 bytes .../newview/skins/xui/en-us/floater_about_land.xml | 16 +- .../skins/xui/en-us/floater_animation_preview.xml | 4 +- .../skins/xui/en-us/floater_color_picker.xml | 10 +- .../newview/skins/xui/en-us/floater_directory.xml | 12 +- .../newview/skins/xui/en-us/floater_god_tools.xml | 2 +- .../newview/skins/xui/en-us/floater_joystick.xml | 58 +- .../skins/xui/en-us/floater_land_holdings.xml | 7 +- .../newview/skins/xui/en-us/floater_tools.xml | 6 +- .../skins/xui/en-us/floater_voice_wizard.xml | 10 +- .../indra/newview/skins/xui/en-us/menu_viewer.xml | 12 +- .../indra/newview/skins/xui/en-us/panel_audio.xml | 14 +- .../indra/newview/skins/xui/en-us/panel_avatar.xml | 100 +- .../newview/skins/xui/en-us/panel_classified.xml | 8 +- .../indra/newview/skins/xui/en-us/panel_event.xml | 12 +- .../skins/xui/en-us/panel_group_general.xml | 1 + .../skins/xui/en-us/panel_group_land_money.xml | 19 +- .../skins/xui/en-us/panel_group_notices.xml | 20 +- .../newview/skins/xui/en-us/panel_place_small.xml | 4 +- .../skins/xui/en-us/panel_preferences_general.xml | 42 +- .../xui/en-us/panel_preferences_graphics1.xml | 4 +- .../skins/xui/en-us/panel_preferences_voice.xml | 37 +- .../skins/xui/en-us/panel_voice_options.xml | 6 +- linden/indra/newview/skins/xui/es/untranslated.xml | 2 - linden/indra/newview/skins/xui/fr/untranslated.xml | 2 - .../newview/skins/xui/ja/floater_about_land.xml | 67 +- .../skins/xui/ja/floater_animation_preview.xml | 7 +- .../newview/skins/xui/ja/floater_audio_volume.xml | 2 +- .../newview/skins/xui/ja/floater_directory.xml | 12 +- .../skins/xui/ja/floater_new_outfit_dialog.xml | 54 +- .../newview/skins/xui/ja/floater_postcard.xml | 16 +- .../skins/xui/ja/floater_preview_gesture.xml | 7 +- .../indra/newview/skins/xui/ja/floater_tools.xml | 26 +- .../newview/skins/xui/ja/floater_world_map.xml | 10 +- linden/indra/newview/skins/xui/ja/need_to_long.xml | 928 ---- .../newview/skins/xui/ja/need_to_translate.xml | 3505 ------------- .../indra/newview/skins/xui/ja/need_to_update.xml | 2338 --------- linden/indra/newview/skins/xui/ja/panel_audio.xml | 16 +- linden/indra/newview/skins/xui/ja/panel_avatar.xml | 2 +- .../newview/skins/xui/ja/panel_avatar_pick.xml | 6 +- linden/indra/newview/skins/xui/ja/panel_event.xml | 20 +- .../indra/newview/skins/xui/ja/panel_friends.xml | 15 +- .../skins/xui/ja/panel_preferences_chat.xml | 2 +- .../skins/xui/ja/panel_preferences_graphics3.xml | 38 +- .../newview/skins/xui/ja/panel_preferences_im.xml | 2 +- linden/indra/newview/skins/xui/ja/untranslated.xml | Bin 344387 -> 0 bytes .../newview/skins/xui/ko/floater_about_land.xml | 3 +- .../skins/xui/ko/floater_animation_preview.xml | 6 +- .../newview/skins/xui/ko/floater_customize.xml | 4 +- .../newview/skins/xui/ko/floater_image_preview.xml | 3 +- .../skins/xui/ko/floater_preview_gesture.xml | 5 +- linden/indra/newview/skins/xui/ko/need_to_long.xml | 344 -- .../newview/skins/xui/ko/need_to_translate.xml | 2904 ----------- .../indra/newview/skins/xui/ko/need_to_update.xml | 454 -- .../indra/newview/skins/xui/ko/panel_friends.xml | 15 +- linden/indra/newview/skins/xui/ko/panel_groups.xml | 13 +- .../newview/skins/xui/ko/panel_voice_remote.xml | 2 +- linden/indra/newview/skins/xui/ko/untranslated.xml | 2 - linden/indra/newview/skins/xui/pt/alerts.xml | 5498 +++++--------------- .../indra/newview/skins/xui/pt/floater_about.xml | 22 +- .../newview/skins/xui/pt/floater_about_land.xml | 623 +-- .../skins/xui/pt/floater_account_history.xml | 4 + .../skins/xui/pt/floater_animation_preview.xml | 220 +- .../indra/newview/skins/xui/pt/floater_auction.xml | 26 +- .../newview/skins/xui/pt/floater_avatar_picker.xml | 37 +- .../skins/xui/pt/floater_avatar_textures.xml | 53 +- .../newview/skins/xui/pt/floater_build_options.xml | 13 +- .../indra/newview/skins/xui/pt/floater_bumps.xml | 28 +- .../newview/skins/xui/pt/floater_buy_contents.xml | 20 +- .../newview/skins/xui/pt/floater_buy_currency.xml | 71 +- .../newview/skins/xui/pt/floater_buy_land.xml | 330 +- .../newview/skins/xui/pt/floater_buy_object.xml | 21 +- .../newview/skins/xui/pt/floater_chat_history.xml | 12 +- .../newview/skins/xui/pt/floater_choose_group.xml | 13 +- .../newview/skins/xui/pt/floater_clothing.xml | 15 +- .../newview/skins/xui/pt/floater_color_picker.xml | 49 +- .../newview/skins/xui/pt/floater_critical.xml | 25 +- .../newview/skins/xui/pt/floater_customize.xml | 722 +-- .../newview/skins/xui/pt/floater_directory.xml | 510 +- .../indra/newview/skins/xui/pt/floater_friends.xml | 48 +- .../indra/newview/skins/xui/pt/floater_gesture.xml | 29 +- .../newview/skins/xui/pt/floater_god_tools.xml | 211 +- .../newview/skins/xui/pt/floater_group_info.xml | 421 +- .../indra/newview/skins/xui/pt/floater_groups.xml | 25 +- linden/indra/newview/skins/xui/pt/floater_html.xml | 29 +- .../newview/skins/xui/pt/floater_html_help.xml | 18 +- linden/indra/newview/skins/xui/pt/floater_im.xml | 35 +- .../newview/skins/xui/pt/floater_image_preview.xml | 67 +- .../indra/newview/skins/xui/pt/floater_import.xml | 27 +- .../indra/newview/skins/xui/pt/floater_inspect.xml | 9 + .../skins/xui/pt/floater_instant_message.xml | 31 +- .../newview/skins/xui/pt/floater_inventory.xml | 128 +- .../xui/pt/floater_inventory_item_properties.xml | 108 +- .../skins/xui/pt/floater_inventory_view_finder.xml | 54 +- .../newview/skins/xui/pt/floater_joystick.xml | 57 + .../newview/skins/xui/pt/floater_land_holdings.xml | 55 +- .../skins/xui/pt/floater_live_lsleditor.xml | 8 +- .../newview/skins/xui/pt/floater_lsl_guide.xml | 23 + .../newview/skins/xui/pt/floater_moveview.xml | 24 +- linden/indra/newview/skins/xui/pt/floater_mute.xml | 16 +- .../skins/xui/pt/floater_name_description.xml | 17 +- .../indra/newview/skins/xui/pt/floater_new_im.xml | 16 +- .../skins/xui/pt/floater_new_outfit_dialog.xml | 152 +- .../newview/skins/xui/pt/floater_openobject.xml | 14 +- linden/indra/newview/skins/xui/pt/floater_pay.xml | 32 +- .../newview/skins/xui/pt/floater_pay_object.xml | 44 +- .../newview/skins/xui/pt/floater_postcard.xml | 44 +- .../newview/skins/xui/pt/floater_preferences.xml | 20 +- .../skins/xui/pt/floater_preview_animation.xml | 14 +- .../xui/pt/floater_preview_embedded_texture.xml | 9 +- .../xui/pt/floater_preview_existing_landmark.xml | 13 +- .../skins/xui/pt/floater_preview_gesture.xml | 79 +- .../skins/xui/pt/floater_preview_new_landmark.xml | 15 +- .../skins/xui/pt/floater_preview_notecard.xml | 15 +- .../pt/floater_preview_notecard_keep_discard.xml | 17 +- .../newview/skins/xui/pt/floater_preview_sound.xml | 15 +- .../skins/xui/pt/floater_preview_texture.xml | 12 +- .../pt/floater_preview_texture_keep_discard.xml | 16 +- .../skins/xui/pt/floater_price_for_listing.xml | 22 +- .../indra/newview/skins/xui/pt/floater_profile.xml | 5 +- linden/indra/newview/skins/xui/pt/floater_rate.xml | 61 +- .../newview/skins/xui/pt/floater_report_abuse.xml | 115 +- .../newview/skins/xui/pt/floater_report_bug.xml | 146 +- .../newview/skins/xui/pt/floater_script_debug.xml | 8 +- .../skins/xui/pt/floater_script_ed_panel.xml | 57 +- .../skins/xui/pt/floater_script_preview.xml | 10 +- .../newview/skins/xui/pt/floater_script_queue.xml | 6 +- .../newview/skins/xui/pt/floater_script_search.xml | 22 +- .../newview/skins/xui/pt/floater_sell_land.xml | 103 +- .../skins/xui/pt/floater_settings_debug.xml | 28 +- .../newview/skins/xui/pt/floater_snapshot.xml | 158 +- .../newview/skins/xui/pt/floater_sound_preview.xml | 40 +- .../indra/newview/skins/xui/pt/floater_telehub.xml | 39 +- .../newview/skins/xui/pt/floater_texture_ctrl.xml | 29 +- .../indra/newview/skins/xui/pt/floater_tools.xml | 846 ++- .../newview/skins/xui/pt/floater_top_objects.xml | 77 +- linden/indra/newview/skins/xui/pt/floater_tos.xml | 36 +- .../skins/xui/pt/floater_wearable_save_as.xml | 15 +- .../newview/skins/xui/pt/floater_world_map.xml | 148 +- .../indra/newview/skins/xui/pt/menu_inventory.xml | 208 +- .../newview/skins/xui/pt/menu_pie_attachment.xml | 20 +- .../indra/newview/skins/xui/pt/menu_pie_avatar.xml | 50 +- .../indra/newview/skins/xui/pt/menu_pie_land.xml | 29 +- .../indra/newview/skins/xui/pt/menu_pie_object.xml | 81 +- .../indra/newview/skins/xui/pt/menu_pie_self.xml | 86 +- linden/indra/newview/skins/xui/pt/menu_viewer.xml | 718 ++- linden/indra/newview/skins/xui/pt/notify.xml | 1103 +--- .../newview/skins/xui/pt/panel_account_details.xml | 5 + .../skins/xui/pt/panel_account_planning.xml | 3 + .../skins/xui/pt/panel_account_transactions.xml | 5 + linden/indra/newview/skins/xui/pt/panel_avatar.xml | 318 +- .../skins/xui/pt/panel_avatar_classified.xml | 39 +- .../newview/skins/xui/pt/panel_avatar_pick.xml | 20 +- .../indra/newview/skins/xui/pt/panel_chat_bar.xml | 20 +- .../newview/skins/xui/pt/panel_classified.xml | 25 +- linden/indra/newview/skins/xui/pt/panel_event.xml | 80 +- linden/indra/newview/skins/xui/pt/panel_group.xml | 26 +- .../newview/skins/xui/pt/panel_group_finder.xml | 17 +- .../newview/skins/xui/pt/panel_group_general.xml | 112 +- .../newview/skins/xui/pt/panel_group_invite.xml | 28 +- .../skins/xui/pt/panel_group_land_money.xml | 123 +- .../newview/skins/xui/pt/panel_group_notices.xml | 112 +- .../newview/skins/xui/pt/panel_group_roles.xml | 261 +- .../newview/skins/xui/pt/panel_group_voting.xml | 122 +- .../newview/skins/xui/pt/panel_land_covenant.xml | 53 +- linden/indra/newview/skins/xui/pt/panel_login.xml | 62 +- .../newview/skins/xui/pt/panel_media_remote.xml | 16 +- .../newview/skins/xui/pt/panel_music_remote.xml | 16 +- .../newview/skins/xui/pt/panel_overlaybar.xml | 21 +- linden/indra/newview/skins/xui/pt/panel_place.xml | 14 +- .../newview/skins/xui/pt/panel_place_small.xml | 14 +- .../skins/xui/pt/panel_preferences_audio.xml | 85 +- .../skins/xui/pt/panel_preferences_chat.xml | 85 +- .../skins/xui/pt/panel_preferences_general.xml | 120 +- .../skins/xui/pt/panel_preferences_graphics1.xml | 64 +- .../skins/xui/pt/panel_preferences_graphics2.xml | 100 +- .../skins/xui/pt/panel_preferences_graphics3.xml | 81 +- .../newview/skins/xui/pt/panel_preferences_im.xml | 41 +- .../skins/xui/pt/panel_preferences_input.xml | 39 +- .../skins/xui/pt/panel_preferences_network.xml | 41 +- .../skins/xui/pt/panel_preferences_popups.xml | 43 +- .../newview/skins/xui/pt/panel_preferences_web.xml | 34 + .../newview/skins/xui/pt/panel_region_covenant.xml | 79 +- .../newview/skins/xui/pt/panel_region_debug.xml | 68 +- .../newview/skins/xui/pt/panel_region_estate.xml | 121 +- .../newview/skins/xui/pt/panel_region_general.xml | 71 +- .../newview/skins/xui/pt/panel_region_terrain.xml | 54 +- .../newview/skins/xui/pt/panel_region_texture.xml | 85 +- .../newview/skins/xui/pt/panel_scrolling_param.xml | 19 +- .../newview/skins/xui/pt/panel_settings_chat.xml | 84 +- .../newview/skins/xui/pt/panel_settings_im.xml | 19 +- .../newview/skins/xui/pt/panel_settings_msgbox.xml | 18 +- .../skins/xui/pt/panel_settings_network.xml | 81 +- .../newview/skins/xui/pt/panel_settings_web.xml | 73 +- .../newview/skins/xui/pt/panel_status_bar.xml | 45 +- .../indra/newview/skins/xui/pt/panel_toolbar.xml | 29 +- .../indra/newview/skins/xui/pt/panel_top_pick.xml | 20 +- linden/indra/newview/skins/xui/pt/role_actions.xml | 372 +- .../newview/skins/xui/pt/teleport_strings.xml | 87 + linden/indra/newview/skins/xui/pt/untranslated.xml | 2 - linden/indra/newview/skins/xui/pt/xui_version.xml | 6 +- linden/indra/newview/skins/xui/zh/alerts.xml | 134 + .../newview/skins/xui/zh/floater_about_land.xml | 12 + .../newview/skins/xui/zh/floater_directory.xml | 6 + .../indra/newview/skins/xui/zh/floater_friends.xml | 18 + .../indra/newview/skins/xui/zh/floater_inspect.xml | 14 + .../newview/skins/xui/zh/need_to_translate.xml | 1390 +++-- .../indra/newview/skins/xui/zh/need_to_update.xml | 816 --- linden/indra/newview/skins/xui/zh/untranslated.xml | 2 - linden/indra/newview/viewer.cpp | 2 +- 242 files changed, 8402 insertions(+), 26869 deletions(-) delete mode 100644 linden/indra/newview/skins/xui/de/need_to_long.xml delete mode 100644 linden/indra/newview/skins/xui/de/need_to_translate.xml delete mode 100644 linden/indra/newview/skins/xui/de/need_to_update.xml delete mode 100644 linden/indra/newview/skins/xui/de/untranslated.xml delete mode 100644 linden/indra/newview/skins/xui/es/untranslated.xml delete mode 100644 linden/indra/newview/skins/xui/fr/untranslated.xml delete mode 100644 linden/indra/newview/skins/xui/ja/need_to_long.xml delete mode 100644 linden/indra/newview/skins/xui/ja/need_to_translate.xml delete mode 100644 linden/indra/newview/skins/xui/ja/need_to_update.xml delete mode 100644 linden/indra/newview/skins/xui/ja/untranslated.xml delete mode 100644 linden/indra/newview/skins/xui/ko/need_to_long.xml delete mode 100644 linden/indra/newview/skins/xui/ko/need_to_translate.xml delete mode 100644 linden/indra/newview/skins/xui/ko/need_to_update.xml delete mode 100644 linden/indra/newview/skins/xui/ko/untranslated.xml create mode 100644 linden/indra/newview/skins/xui/pt/floater_account_history.xml create mode 100644 linden/indra/newview/skins/xui/pt/floater_inspect.xml create mode 100644 linden/indra/newview/skins/xui/pt/floater_joystick.xml create mode 100644 linden/indra/newview/skins/xui/pt/floater_lsl_guide.xml create mode 100644 linden/indra/newview/skins/xui/pt/panel_account_details.xml create mode 100644 linden/indra/newview/skins/xui/pt/panel_account_planning.xml create mode 100644 linden/indra/newview/skins/xui/pt/panel_account_transactions.xml create mode 100644 linden/indra/newview/skins/xui/pt/panel_preferences_web.xml create mode 100644 linden/indra/newview/skins/xui/pt/teleport_strings.xml delete mode 100644 linden/indra/newview/skins/xui/pt/untranslated.xml create mode 100644 linden/indra/newview/skins/xui/zh/floater_inspect.xml delete mode 100644 linden/indra/newview/skins/xui/zh/need_to_update.xml delete mode 100644 linden/indra/newview/skins/xui/zh/untranslated.xml (limited to 'linden/indra') diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index 46573f4..9164739 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 18; const S32 LL_VERSION_PATCH = 4; -const S32 LL_VERSION_BUILD = 0; +const S32 LL_VERSION_BUILD = 1; const char * const LL_CHANNEL = "Second Life Release"; diff --git a/linden/indra/llvfs/lldir_win32.cpp b/linden/indra/llvfs/lldir_win32.cpp index 277cfea..f3edbc3 100644 --- a/linden/indra/llvfs/lldir_win32.cpp +++ b/linden/indra/llvfs/lldir_win32.cpp @@ -41,6 +41,7 @@ #include #include #include +#include // Utility stuff to get versions of the sh #define PACKVERSION(major,minor) MAKELONG(minor,major) diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings index d01c217..ae1ddea 100644 --- a/linden/indra/newview/English.lproj/InfoPlist.strings +++ b/linden/indra/newview/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Second Life"; -CFBundleShortVersionString = "Second Life version 1.18.4.0"; -CFBundleGetInfoString = "Second Life version 1.18.4.0, Copyright 2004-2007 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.18.4.1"; +CFBundleGetInfoString = "Second Life version 1.18.4.1, Copyright 2004-2007 Linden Research, Inc."; diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist index e6c366f..a761a78 100644 --- a/linden/indra/newview/Info-SecondLife.plist +++ b/linden/indra/newview/Info-SecondLife.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.18.4.0 + 1.18.4.1 CSResourcesFileMapped diff --git a/linden/indra/newview/llfloaterlandholdings.cpp b/linden/indra/newview/llfloaterlandholdings.cpp index 5aac949..bccabb3 100644 --- a/linden/indra/newview/llfloaterlandholdings.cpp +++ b/linden/indra/newview/llfloaterlandholdings.cpp @@ -116,8 +116,10 @@ BOOL LLFloaterLandHoldings::postBuild() element["columns"][0]["value"] = gAgent.mGroups.get(i).mName; element["columns"][0]["font"] = "SANSSERIF"; + LLUIString areastr = getUIString("area_string"); + areastr.setArg("[AREA]", llformat("%d", gAgent.mGroups.get(i).mContribution)); element["columns"][1]["column"] = "area"; - element["columns"][1]["value"] = llformat("%d sq. meters", gAgent.mGroups.get(i).mContribution); + element["columns"][1]["value"] = areastr; element["columns"][1]["font"] = "SANSSERIF"; list->addElement(element, ADD_SORTED); @@ -315,14 +317,7 @@ void LLFloaterLandHoldings::refreshAggregates() S32 current_area = gStatusBar->getSquareMetersCommitted(); S32 available_area = gStatusBar->getSquareMetersLeft(); - char buffer[MAX_STRING]; /* Flawfinder: ignore */ - - snprintf(buffer, MAX_STRING, "%d sq. meters", allowed_area); /* Flawfinder: ignore */ - childSetValue("allowed_text", LLSD(buffer)); - - snprintf(buffer, MAX_STRING, "%d sq. meters", current_area); /* Flawfinder: ignore */ - childSetValue("current_text", LLSD(buffer)); - - snprintf(buffer, MAX_STRING, "%d sq. meters", available_area); /* Flawfinder: ignore */ - childSetValue("available_text", LLSD(buffer)); + childSetTextArg("allowed_text", "[AREA]", llformat("%d",allowed_area)); + childSetTextArg("current_text", "[AREA]", llformat("%d",current_area)); + childSetTextArg("available_text", "[AREA]", llformat("%d",available_area)); } diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp index 5833c2f..20f3192 100644 --- a/linden/indra/newview/llfloaterregioninfo.cpp +++ b/linden/indra/newview/llfloaterregioninfo.cpp @@ -716,10 +716,11 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate() body["allow_land_resell"] = childGetValue("allow_land_resell_check"); body["agent_limit"] = childGetValue("agent_limit_spin"); body["prim_bonus"] = childGetValue("object_bonus_spin"); - body["sim_access"] = childGetValue("access_combo"); + body["sim_access"] = LLViewerRegion::stringToAccess(childGetValue("access_combo").asString().c_str()); body["restrict_pushobject"] = childGetValue("restrict_pushobject"); body["allow_parcel_changes"] = childGetValue("allow_parcel_changes_check"); body["block_parcel_search"] = childGetValue("block_parcel_search_check"); + LLHTTPClient::post(url, body, new LLHTTPClient::Responder()); } else diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp index 0c3edf1..1e93c12 100644 --- a/linden/indra/newview/llpanelclassified.cpp +++ b/linden/indra/newview/llpanelclassified.cpp @@ -671,9 +671,12 @@ void LLPanelClassified::refresh() //mEnabledCheck->setEnabled(is_self); mMatureCheck->setEnabled(is_self); - mAutoRenewCheck->setEnabled(is_self); - mAutoRenewCheck->setVisible(is_self); - + if (mAutoRenewCheck) + { + mAutoRenewCheck->setEnabled(is_self); + mAutoRenewCheck->setVisible(is_self); + } + mClickThroughText->setEnabled(is_self); mClickThroughText->setVisible(is_self); @@ -771,7 +774,10 @@ void LLPanelClassified::confirmPublish(S32 option) mLocationChanged = false; mCategoryCombo->resetDirty(); mMatureCheck->resetDirty(); - mAutoRenewCheck->resetDirty(); + if (mAutoRenewCheck) + { + mAutoRenewCheck->resetDirty(); + } } // static diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp index 63e25d9..8dbe72f 100644 --- a/linden/indra/newview/llpanelface.cpp +++ b/linden/indra/newview/llpanelface.cpp @@ -480,7 +480,7 @@ void LLPanelFace::getState() { F32 get(LLViewerObject* object, S32 face) { - return object->getTE(face)->mScaleS; + return object->getTE(face)->mScaleT; } } func; identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, scale_t ); diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp index ba0895d..33dbcd7 100644 --- a/linden/indra/newview/llpanelgroupgeneral.cpp +++ b/linden/indra/newview/llpanelgroupgeneral.cpp @@ -392,9 +392,7 @@ void LLPanelGroupGeneral::openProfile(void* data) bool LLPanelGroupGeneral::needsApply(LLString& mesg) { - llinfos << "LLPanelGroupGeneral::needsApply(LLString& mesg) " << mChanged << llendl; - - mesg = "General group information has changed."; + mesg = getUIString("group_info_unchanged"); return mChanged || mGroupID.isNull(); } diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp index a6ffe4f..4c12aa2 100644 --- a/linden/indra/newview/llpanelgrouplandmoney.cpp +++ b/linden/indra/newview/llpanelgrouplandmoney.cpp @@ -573,7 +573,7 @@ bool LLPanelGroupLandMoney::apply(LLString& mesg) { if (!mImplementationp->applyContribution() ) { - mesg.assign("Unable to set your land contribution."); + mesg.assign(getUIString("land_contrib_error")); return false; } diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp index 3d5723e..923f4b3 100644 --- a/linden/indra/newview/llpanelpermissions.cpp +++ b/linden/indra/newview/llpanelpermissions.cpp @@ -756,7 +756,7 @@ void LLPanelPermissions::refresh() BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ); bool include_in_search; bool all_include_in_search = gSelectMgr->selectionGetIncludeInSearch(&include_in_search); - childSetEnabled("search_check", is_perm_modify && all_volume); + childSetEnabled("search_check", has_change_sale_ability && all_volume); childSetValue("search_check", include_in_search); childSetTentative("search_check", ! all_include_in_search); diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp index 128a802..3c29cfd 100644 --- a/linden/indra/newview/llselectmgr.cpp +++ b/linden/indra/newview/llselectmgr.cpp @@ -2232,8 +2232,8 @@ BOOL LLSelectMgr::selectGetCreator(LLUUID& result_id, LLString& name) BOOL identical = TRUE; BOOL first = TRUE; LLUUID first_id; - for (LLObjectSelection::root_iterator iter = getSelection()->root_begin(); - iter != getSelection()->root_end(); iter++ ) + for (LLObjectSelection::root_object_iterator iter = getSelection()->root_object_begin(); + iter != getSelection()->root_object_end(); iter++ ) { LLSelectNode* node = *iter; if (!node->mValid) @@ -2255,7 +2255,11 @@ BOOL LLSelectMgr::selectGetCreator(LLUUID& result_id, LLString& name) } } } - + if (first_id.isNull()) + { + return FALSE; + } + result_id = first_id; if (identical) @@ -2286,8 +2290,8 @@ BOOL LLSelectMgr::selectGetOwner(LLUUID& result_id, LLString& name) BOOL first = TRUE; BOOL first_group_owned = FALSE; LLUUID first_id; - for (LLObjectSelection::root_iterator iter = getSelection()->root_begin(); - iter != getSelection()->root_end(); iter++ ) + for (LLObjectSelection::root_object_iterator iter = getSelection()->root_object_begin(); + iter != getSelection()->root_object_end(); iter++ ) { LLSelectNode* node = *iter; if (!node->mValid) @@ -2312,6 +2316,10 @@ BOOL LLSelectMgr::selectGetOwner(LLUUID& result_id, LLString& name) } } } + if (first_id.isNull()) + { + return FALSE; + } result_id = first_id; @@ -2354,8 +2362,8 @@ BOOL LLSelectMgr::selectGetLastOwner(LLUUID& result_id, LLString& name) BOOL identical = TRUE; BOOL first = TRUE; LLUUID first_id; - for (LLObjectSelection::root_iterator iter = getSelection()->root_begin(); - iter != getSelection()->root_end(); iter++ ) + for (LLObjectSelection::root_object_iterator iter = getSelection()->root_object_begin(); + iter != getSelection()->root_object_end(); iter++ ) { LLSelectNode* node = *iter; if (!node->mValid) @@ -2377,6 +2385,10 @@ BOOL LLSelectMgr::selectGetLastOwner(LLUUID& result_id, LLString& name) } } } + if (first_id.isNull()) + { + return FALSE; + } result_id = first_id; @@ -2415,8 +2427,8 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& result_id) BOOL identical = TRUE; BOOL first = TRUE; LLUUID first_id; - for (LLObjectSelection::root_iterator iter = getSelection()->root_begin(); - iter != getSelection()->root_end(); iter++ ) + for (LLObjectSelection::root_object_iterator iter = getSelection()->root_object_begin(); + iter != getSelection()->root_object_end(); iter++ ) { LLSelectNode* node = *iter; if (!node->mValid) @@ -2438,6 +2450,10 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& result_id) } } } + if (first_id.isNull()) + { + return FALSE; + } result_id = first_id; @@ -2452,8 +2468,8 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& result_id) BOOL LLSelectMgr::selectIsGroupOwned() { BOOL found_one = FALSE; - for (LLObjectSelection::root_iterator iter = getSelection()->root_begin(); - iter != getSelection()->root_end(); iter++ ) + for (LLObjectSelection::root_object_iterator iter = getSelection()->root_object_begin(); + iter != getSelection()->root_object_end(); iter++ ) { LLSelectNode* node = *iter; if (!node->mValid) diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h index 26b919b..071aa15 100644 --- a/linden/indra/newview/llselectmgr.h +++ b/linden/indra/newview/llselectmgr.h @@ -254,6 +254,18 @@ public: valid_root_iterator valid_root_begin() { return valid_root_iterator(mList.begin(), mList.end()); } valid_root_iterator valid_root_end() { return valid_root_iterator(mList.end(), mList.end()); } + struct is_root_object + { + bool operator()(LLSelectNode* node) + { + LLViewerObject* object = node->getObject(); + return (object != NULL) && (object->isRootEdit() || object->isJointChild()); + } + }; + typedef boost::filter_iterator root_object_iterator; + root_object_iterator root_object_begin() { return root_object_iterator(mList.begin(), mList.end()); } + root_object_iterator root_object_end() { return root_object_iterator(mList.end(), mList.end()); } + public: LLObjectSelection(); diff --git a/linden/indra/newview/llsrv.cpp b/linden/indra/newview/llsrv.cpp index 150fcb1..7271513 100644 --- a/linden/indra/newview/llsrv.cpp +++ b/linden/indra/newview/llsrv.cpp @@ -51,6 +51,19 @@ std::vector LLSRV::rewriteURI(const std::string& uri) LLPointer resp = new Responder; gAres->rewriteURI(uri, resp); - gAres->processAll(); - return resp->mUris; + gAres->processAll(); + + // It's been observed in deployment that c-ares can return control + // to us without firing all of our callbacks, in which case the + // returned vector will be empty, instead of a singleton as we + // might wish. + + if (!resp->mUris.empty()) + { + return resp->mUris; + } + + std::vector uris; + uris.push_back(uri); + return uris; } diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp index 0be4212..1f607de 100644 --- a/linden/indra/newview/lltooldraganddrop.cpp +++ b/linden/indra/newview/lltooldraganddrop.cpp @@ -1409,7 +1409,46 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, { LLFirstUse::useSandbox(); } + // check if it cannot be copied, and mark as remove if it is - + // this will remove the object from inventory after rez. Only + // bother with this check if we would not normally remove from + // inventory. + if(!remove_from_inventory + && !item->getPermissions().allowCopyBy(gAgent.getID())) + { + remove_from_inventory = TRUE; + } + + // Limit raycast to a single object. + // Speeds up server raycast + avoid problems with server ray + // hitting objects that were clipped by the near plane or culled + // on the viewer. + LLUUID ray_target_id; + if( raycast_target ) + { + ray_target_id = raycast_target->getID(); + } + else + { + ray_target_id.setNull(); + } + // Check if it's in the trash. + bool is_in_trash = false; + LLUUID trash_id; + trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH); + if(gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) + { + is_in_trash = true; + remove_from_inventory = TRUE; + } + + LLUUID source_id = from_task_inventory ? mSourceID : LLUUID::null; + + // Select the object only if we're editing. + BOOL rez_selected = gToolMgr->inEdit(); + + // Message packing code should be it's own uninterrupted block LLMessageSystem* msg = gMessageSystem; if (mSource == SOURCE_NOTECARD) { @@ -1430,55 +1469,13 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, // *FIX: We can probably compress this to a single byte, since I // think folderid == mSourceID. This will be a later // optimization. - if(from_task_inventory) - { - msg->addUUIDFast(_PREHASH_FromTaskID, mSourceID); - } - else - { - msg->addUUIDFast(_PREHASH_FromTaskID, LLUUID::null); - } + msg->addUUIDFast(_PREHASH_FromTaskID, source_id); msg->addU8Fast(_PREHASH_BypassRaycast, (U8) bypass_sim_raycast); msg->addVector3Fast(_PREHASH_RayStart, regionp->getPosRegionFromGlobal(mLastCameraPos)); msg->addVector3Fast(_PREHASH_RayEnd, regionp->getPosRegionFromGlobal(mLastHitPos)); - // Limit raycast to a single object. - // Speeds up server raycast + avoid problems with server ray - // hitting objects that were clipped by the near plane or culled - // on the viewer. - LLUUID ray_target_id; - if( raycast_target ) - { - ray_target_id = raycast_target->getID(); - } - else - { - ray_target_id.setNull(); - } msg->addUUIDFast(_PREHASH_RayTargetID, ray_target_id ); msg->addBOOLFast(_PREHASH_RayEndIsIntersection, FALSE); - // Select the object only if we're editing. - BOOL rez_selected = gToolMgr->inEdit(); msg->addBOOLFast(_PREHASH_RezSelected, rez_selected); - - // check if it cannot be copied, and mark as remove if it is - - // this will remove the object from inventory after rez. Only - // bother with this check if we would not normally remove from - // inventory. - if(!remove_from_inventory - && !item->getPermissions().allowCopyBy(gAgent.getID())) - { - remove_from_inventory = TRUE; - } - - // Check if it's in the trash. - bool is_in_trash = false; - LLUUID trash_id; - trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH); - if(gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) - { - is_in_trash = true; - remove_from_inventory = TRUE; - } msg->addBOOLFast(_PREHASH_RemoveItem, remove_from_inventory); // deal with permissions slam logic diff --git a/linden/indra/newview/lluserauth.cpp b/linden/indra/newview/lluserauth.cpp index 196a4c8..0f4c108 100644 --- a/linden/indra/newview/lluserauth.cpp +++ b/linden/indra/newview/lluserauth.cpp @@ -124,11 +124,7 @@ void LLUserAuth::authenticate( XMLRPC_VectorAppendString(params, "last", lastname, 0); XMLRPC_VectorAppendString(params, "passwd", dpasswd.c_str(), 0); XMLRPC_VectorAppendString(params, "start", start, 0); - char buffer[MAX_STRING]; /* Flawfinder: ignore */ - // the version is treated as a single string - snprintf(buffer, MAX_STRING, "%d.%d.%d.%d", - LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD); /* Flawfinder: ignore */ - XMLRPC_VectorAppendString(params, "version", buffer, 0); + XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name XMLRPC_VectorAppendString(params, "channel", gChannelName.c_str(), 0); XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0); XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0); @@ -146,8 +142,7 @@ void LLUserAuth::authenticate( { XMLRPC_VectorAppendString(params, "read_critical", "true", 0); } - viewer_digest.toString(buffer); - XMLRPC_VectorAppendString(params, "viewer_digest", buffer, 0); + XMLRPC_VectorAppendString(params, "viewer_digest", viewer_digest.asString().c_str(), 0); XMLRPC_VectorAppendInt(params, "last_exec_event", (int) last_exec_froze); // append optional requests in an array @@ -231,7 +226,6 @@ static void parseOptionInto( { std::string key; std::string val; - char buffer[MAX_STRING]; /* Flawfinder: ignore */ XMLRPC_VALUE_TYPE_EASY type; XMLRPC_VALUE row = XMLRPC_VectorRewind(option); while(row) @@ -249,8 +243,7 @@ static void parseOptionInto( } else if(xmlrpc_type_int == type) { - snprintf(buffer, MAX_STRING, "%d", XMLRPC_GetValueInt(opt)); /* Flawfinder: ignore */ - val.assign(buffer); + val = llformat("%d", XMLRPC_GetValueInt(opt)); } //llinfos "option val: " << val << llendl; responses.insert(LLUserAuth::response_t::value_type(key, val)); diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp index 08d8aad..48f1aac 100644 --- a/linden/indra/newview/llworldmapview.cpp +++ b/linden/indra/newview/llworldmapview.cpp @@ -896,6 +896,7 @@ void LLWorldMapView::drawAgents() { const LLItemInfo& info = *iter; S32 agent_count = info.mExtra; + sim_agent_count += info.mExtra; // Here's how we'd choose the color if info.mID were available but it's not being sent: //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? gFriendMapColor : gAvatarMapColor; drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor); diff --git a/linden/indra/newview/newview_vc8.vcproj b/linden/indra/newview/newview_vc8.vcproj index f76ea96..7e8068c 100644 --- a/linden/indra/newview/newview_vc8.vcproj +++ b/linden/indra/newview/newview_vc8.vcproj @@ -69,7 +69,7 @@ /> + + @@ -729,10 +733,6 @@ > - - @@ -1465,6 +1465,14 @@ > + + + + @@ -1939,6 +1947,10 @@ > + + @@ -2951,6 +2963,14 @@ > + + + + diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt index 424f44b..f9a5e42 100644 --- a/linden/indra/newview/releasenotes.txt +++ b/linden/indra/newview/releasenotes.txt @@ -1,3 +1,17 @@ +Release Notes for Second Life 1.18.4(1) October 26, 2007 +===================================== +Bug fixes: +* Crash on startup (due to empty list of rewritten login URIs) +* Viewer crash while trying to rez an object +* Crash when editing classifieds +* Land & L$ fields no longer update +* Minimizing the search window followed by Ctrl+F crashes +* Parcel option doesnt save publish listing on the web setting +* Texture editing user interface is confusing +* Can.t set Repeats Per Face with up/down arrows +* Auction ID and Land Description Overlap in the .About Land. window + + Release Notes for Second Life 1.18.4(0) October 17, 2007 ===================================== New features: diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc index 9094a9c..c4e9f17 100644 --- a/linden/indra/newview/res/newViewRes.rc +++ b/linden/indra/newview/res/newViewRes.rc @@ -227,8 +227,8 @@ TOOLPIPETTE CURSOR "toolpipette.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,18,4,0 - PRODUCTVERSION 1,18,4,0 + FILEVERSION 1,18,4,1 + PRODUCTVERSION 1,18,4,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -245,12 +245,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "1.18.4.0" + VALUE "FileVersion", "1.18.4.1" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright 2001-2007, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "1.18.4.0" + VALUE "ProductVersion", "1.18.4.1" END END BLOCK "VarFileInfo" diff --git a/linden/indra/newview/skins/xui/de/floater_active_speakers.xml b/linden/indra/newview/skins/xui/de/floater_active_speakers.xml index 9ff7fed..ed21f5e 100644 --- a/linden/indra/newview/skins/xui/de/floater_active_speakers.xml +++ b/linden/indra/newview/skins/xui/de/floater_active_speakers.xml @@ -4,8 +4,9 @@ - -