From 359fb947411654e7d345709448db6ff316551d96 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Tue, 1 Sep 2009 11:04:15 -0700 Subject: Sync up with a number of SVN changes that snuck in via weird merges --- indra/newview/da.lproj/language.txt | 1 + indra/newview/es.lproj/language.txt | 1 + indra/newview/featuretable.txt | 3 +- indra/newview/featuretable_linux.txt | 2 +- indra/newview/featuretable_mac.txt | 2 +- indra/newview/fr.lproj/language.txt | 1 + indra/newview/hu.lproj/language.txt | 1 + indra/newview/installers/windows/lang_fr.nsi | Bin 8118 -> 8114 bytes indra/newview/it.lproj/language.txt | 1 + indra/newview/llappviewermacosx.h | 1 - indra/newview/lldrawpoolsky.h | 4 - indra/newview/nl.lproj/language.txt | 1 + indra/newview/pl.lproj/language.txt | 1 + indra/newview/pt.lproj/language.txt | 1 + indra/newview/ru.lproj/language.txt | 1 + .../skins/default/xui/da/floater_avatar_picker.xml | 47 ++++++++--- .../skins/default/xui/da/floater_build_options.xml | 4 +- .../skins/default/xui/da/floater_bulk_perms.xml | 44 ++++++++++ .../skins/default/xui/da/floater_buy_currency.xml | 2 +- .../skins/default/xui/da/floater_font_test.xml | 6 ++ .../skins/default/xui/da/floater_inspect.xml | 18 ++--- .../skins/default/xui/da/floater_joystick.xml | 38 ++++----- .../skins/default/xui/da/floater_lagmeter.xml | 16 ++-- .../skins/default/xui/da/floater_land_holdings.xml | 19 ++--- .../skins/default/xui/da/floater_lsl_guide.xml | 2 +- .../skins/default/xui/da/floater_perm_prefs.xml | 16 ++++ .../default/xui/da/floater_preview_notecard.xml | 11 ++- .../skins/default/xui/da/floater_sound_preview.xml | 2 +- .../skins/default/xui/da/floater_statistics.xml | 2 + .../skins/default/xui/da/floater_telehub.xml | 8 +- .../skins/default/xui/da/menu_inventory.xml | 1 + .../newview/skins/default/xui/da/menu_mini_map.xml | 8 ++ .../skins/default/xui/da/panel_group_general.xml | 55 ++++++------- .../skins/default/xui/da/panel_group_invite.xml | 9 ++- .../default/xui/da/panel_group_land_money.xml | 46 ++++++----- .../skins/default/xui/da/panel_group_roles.xml | 12 +-- .../newview/skins/default/xui/da/panel_groups.xml | 4 +- .../skins/default/xui/da/panel_region_covenant.xml | 71 +++++++++++----- .../skins/default/xui/da/panel_region_estate.xml | 2 +- .../skins/default/xui/da/panel_region_general.xml | 73 ++++++++++------- .../skins/default/xui/da/panel_region_terrain.xml | 4 +- .../skins/default/xui/da/teleport_strings.xml | 25 +++--- .../skins/default/xui/de/floater_mute_object.xml | 4 +- .../skins/default/xui/en/widgets/filter_editor.xml | 16 ++-- .../skins/default/xui/en/widgets/list_view.xml | 12 +-- .../skins/default/xui/en/widgets/split_button.xml | 48 +++++------ .../skins/default/xui/es/floater_about_land.xml | 26 +++--- .../skins/default/xui/es/floater_avatar_picker.xml | 8 +- .../skins/default/xui/es/floater_build_options.xml | 6 +- .../skins/default/xui/es/floater_buy_contents.xml | 2 +- .../skins/default/xui/es/floater_buy_currency.xml | 12 +-- .../skins/default/xui/es/floater_color_picker.xml | 3 +- .../default/xui/es/floater_day_cycle_options.xml | 12 +-- .../skins/default/xui/es/floater_env_settings.xml | 15 ++-- .../skins/default/xui/es/floater_gesture.xml | 5 +- .../skins/default/xui/es/floater_inspect.xml | 10 +-- .../xui/es/floater_inventory_view_finder.xml | 10 +-- .../skins/default/xui/es/floater_lagmeter.xml | 13 +-- .../skins/default/xui/es/floater_land_holdings.xml | 2 +- .../default/xui/es/floater_live_lsleditor.xml | 4 +- .../skins/default/xui/es/floater_lsl_guide.xml | 4 +- .../skins/default/xui/es/floater_media_browser.xml | 9 ++- .../skins/default/xui/es/floater_mute_object.xml | 7 +- indra/newview/skins/default/xui/es/floater_pay.xml | 9 ++- .../skins/default/xui/es/floater_pay_object.xml | 10 +-- .../skins/default/xui/es/floater_preferences.xml | 5 +- .../default/xui/es/floater_preview_animation.xml | 4 +- .../skins/default/xui/es/floater_script_search.xml | 16 ++-- .../skins/default/xui/es/floater_select_key.xml | 2 +- .../skins/default/xui/es/floater_telehub.xml | 18 +++-- .../skins/default/xui/es/floater_texture_ctrl.xml | 4 +- .../newview/skins/default/xui/es/floater_tools.xml | 68 ++++++++-------- .../skins/default/xui/es/floater_top_objects.xml | 21 ++--- .../skins/default/xui/es/floater_url_entry.xml | 3 +- .../newview/skins/default/xui/es/floater_water.xml | 22 ++--- .../default/xui/es/floater_windlight_options.xml | 20 ++--- .../skins/default/xui/es/panel_group_general.xml | 12 +-- .../skins/default/xui/es/panel_group_invite.xml | 17 ++-- .../default/xui/es/panel_group_land_money.xml | 15 ++-- .../skins/default/xui/es/panel_group_notices.xml | 17 ++-- .../skins/default/xui/es/panel_group_roles.xml | 46 ++++++----- .../newview/skins/default/xui/es/panel_groups.xml | 8 +- .../skins/default/xui/es/panel_region_covenant.xml | 10 ++- .../skins/default/xui/es/panel_region_debug.xml | 16 ++-- .../skins/default/xui/es/panel_region_estate.xml | 16 ++-- .../skins/default/xui/es/panel_region_general.xml | 10 +-- .../skins/default/xui/es/panel_region_terrain.xml | 16 ++-- .../skins/default/xui/es/panel_region_texture.xml | 2 +- .../skins/default/xui/fr/floater_customize.xml | 22 ++--- .../skins/default/xui/fr/floater_inventory.xml | 4 +- .../xui/fr/floater_inventory_view_finder.xml | 8 +- .../skins/default/xui/fr/floater_mem_leaking.xml | 6 +- .../skins/default/xui/it/floater_about_land.xml | 6 +- .../skins/default/xui/it/floater_avatar_picker.xml | 8 +- .../skins/default/xui/it/floater_build_options.xml | 6 +- .../skins/default/xui/it/floater_buy_contents.xml | 6 +- .../skins/default/xui/it/floater_buy_currency.xml | 6 +- .../default/xui/it/floater_day_cycle_options.xml | 30 +++---- .../skins/default/xui/it/floater_env_settings.xml | 14 ++-- .../skins/default/xui/it/floater_gesture.xml | 11 +-- .../skins/default/xui/it/floater_inspect.xml | 10 +-- .../xui/it/floater_inventory_view_finder.xml | 2 +- .../skins/default/xui/it/floater_joystick.xml | 49 ++++++------ .../skins/default/xui/it/floater_lagmeter.xml | 17 ++-- .../skins/default/xui/it/floater_land_holdings.xml | 10 +-- .../default/xui/it/floater_live_lsleditor.xml | 4 +- .../skins/default/xui/it/floater_lsl_guide.xml | 4 +- .../skins/default/xui/it/floater_media_browser.xml | 9 ++- .../skins/default/xui/it/floater_mute_object.xml | 6 +- indra/newview/skins/default/xui/it/floater_pay.xml | 21 ++--- .../skins/default/xui/it/floater_pay_object.xml | 23 +++--- .../skins/default/xui/it/floater_preferences.xml | 3 +- .../default/xui/it/floater_preview_animation.xml | 4 +- .../skins/default/xui/it/floater_script_search.xml | 16 ++-- .../skins/default/xui/it/floater_telehub.xml | 18 +++-- .../skins/default/xui/it/floater_top_objects.xml | 31 +++---- .../skins/default/xui/it/floater_url_entry.xml | 4 +- .../newview/skins/default/xui/it/floater_water.xml | 44 +++++----- .../default/xui/it/floater_windlight_options.xml | 32 ++++---- .../newview/skins/default/xui/it/panel_friends.xml | 2 +- .../skins/default/xui/it/panel_group_general.xml | 2 +- .../skins/default/xui/it/panel_group_invite.xml | 4 +- .../default/xui/it/panel_group_land_money.xml | 23 +++--- .../skins/default/xui/it/panel_group_notices.xml | 31 ++++--- .../skins/default/xui/it/panel_group_roles.xml | 44 +++++----- .../newview/skins/default/xui/it/panel_groups.xml | 10 ++- .../skins/default/xui/it/panel_region_covenant.xml | 30 ++++--- .../skins/default/xui/it/panel_region_debug.xml | 12 +-- .../skins/default/xui/it/panel_region_estate.xml | 16 ++-- .../skins/default/xui/it/panel_region_general.xml | 22 ++--- .../skins/default/xui/it/panel_region_terrain.xml | 8 +- .../skins/default/xui/it/panel_region_texture.xml | 6 +- .../skins/default/xui/it/teleport_strings.xml | 18 ++--- .../skins/default/xui/ja/floater_buy_contents.xml | 13 +-- .../default/xui/ja/floater_wearable_save_as.xml | 2 +- .../default/xui/ja/panel_group_land_money.xml | 3 +- .../skins/default/xui/nl/floater_about_land.xml | 12 +-- .../skins/default/xui/nl/floater_buy_contents.xml | 2 +- .../skins/default/xui/nl/floater_color_picker.xml | 5 +- .../skins/default/xui/nl/floater_env_settings.xml | 7 +- .../skins/default/xui/nl/floater_inspect.xml | 8 +- .../skins/default/xui/nl/floater_joystick.xml | 11 +-- .../skins/default/xui/nl/floater_mute_object.xml | 8 +- .../skins/default/xui/nl/floater_openobject.xml | 4 +- indra/newview/skins/default/xui/nl/floater_pay.xml | 4 +- .../skins/default/xui/nl/floater_pay_object.xml | 12 +-- .../skins/default/xui/nl/floater_perm_prefs.xml | 2 +- .../skins/default/xui/nl/floater_select_key.xml | 4 +- .../skins/default/xui/nl/floater_telehub.xml | 16 +++- .../skins/default/xui/nl/floater_texture_ctrl.xml | 6 +- .../newview/skins/default/xui/nl/floater_tools.xml | 86 ++++++++++---------- .../skins/default/xui/nl/floater_top_objects.xml | 26 +++--- .../skins/default/xui/nl/floater_url_entry.xml | 4 +- .../newview/skins/default/xui/nl/floater_water.xml | 5 +- .../newview/skins/default/xui/nl/panel_friends.xml | 12 +-- .../skins/default/xui/nl/panel_group_general.xml | 19 ++--- .../skins/default/xui/nl/panel_group_invite.xml | 9 ++- .../skins/default/xui/nl/panel_group_notices.xml | 24 ++++-- .../skins/default/xui/nl/panel_group_roles.xml | 34 +++++--- .../newview/skins/default/xui/nl/panel_groups.xml | 14 ++-- .../skins/default/xui/nl/panel_region_estate.xml | 16 ++-- .../skins/default/xui/nl/panel_region_general.xml | 4 +- .../skins/default/xui/pl/floater_joystick.xml | 89 +++++++++++---------- .../skins/default/xui/pl/floater_preview_sound.xml | 2 +- .../skins/default/xui/pl/floater_telehub.xml | 4 +- .../newview/skins/default/xui/pl/floater_tools.xml | 30 +++---- .../skins/default/xui/pt/floater_about_land.xml | 6 +- .../skins/default/xui/pt/floater_avatar_picker.xml | 12 +-- .../skins/default/xui/pt/floater_build_options.xml | 6 +- .../skins/default/xui/pt/floater_buy_contents.xml | 6 +- .../skins/default/xui/pt/floater_color_picker.xml | 6 +- .../default/xui/pt/floater_day_cycle_options.xml | 28 +++---- .../skins/default/xui/pt/floater_env_settings.xml | 12 +-- .../skins/default/xui/pt/floater_inspect.xml | 10 +-- .../xui/pt/floater_inventory_view_finder.xml | 6 +- .../skins/default/xui/pt/floater_joystick.xml | 41 +++++----- .../skins/default/xui/pt/floater_lagmeter.xml | 13 +-- .../skins/default/xui/pt/floater_land_holdings.xml | 10 +-- .../default/xui/pt/floater_live_lsleditor.xml | 2 +- .../skins/default/xui/pt/floater_lsl_guide.xml | 4 +- .../skins/default/xui/pt/floater_mute_object.xml | 5 +- indra/newview/skins/default/xui/pt/floater_pay.xml | 2 +- .../skins/default/xui/pt/floater_preferences.xml | 3 +- .../skins/default/xui/pt/floater_preview_sound.xml | 4 +- .../skins/default/xui/pt/floater_script_search.xml | 16 ++-- .../skins/default/xui/pt/floater_telehub.xml | 18 +++-- .../newview/skins/default/xui/pt/floater_tools.xml | 61 +++++++------- .../skins/default/xui/pt/floater_top_objects.xml | 13 +-- .../skins/default/xui/pt/floater_url_entry.xml | 1 + .../newview/skins/default/xui/pt/floater_water.xml | 23 +++--- .../default/xui/pt/floater_windlight_options.xml | 23 +++--- .../newview/skins/default/xui/pt/panel_friends.xml | 12 +-- .../skins/default/xui/pt/panel_group_general.xml | 6 +- .../skins/default/xui/pt/panel_group_invite.xml | 10 +-- .../default/xui/pt/panel_group_land_money.xml | 11 +-- .../skins/default/xui/pt/panel_group_notices.xml | 21 +++-- .../skins/default/xui/pt/panel_group_roles.xml | 45 ++++++----- .../newview/skins/default/xui/pt/panel_groups.xml | 17 ++-- .../skins/default/xui/pt/panel_region_covenant.xml | 20 +++-- .../skins/default/xui/pt/panel_region_debug.xml | 10 +-- .../skins/default/xui/pt/panel_region_estate.xml | 4 +- .../skins/default/xui/pt/panel_region_terrain.xml | 10 +-- .../skins/default/xui/pt/panel_region_texture.xml | 2 +- indra/newview/tr.lproj/language.txt | 1 + indra/newview/uk.lproj/language.txt | 1 + indra/newview/zh-Hans.lproj/language.txt | 1 + 206 files changed, 1572 insertions(+), 1270 deletions(-) create mode 100644 indra/newview/da.lproj/language.txt create mode 100644 indra/newview/es.lproj/language.txt create mode 100644 indra/newview/fr.lproj/language.txt create mode 100644 indra/newview/hu.lproj/language.txt create mode 100644 indra/newview/it.lproj/language.txt create mode 100644 indra/newview/nl.lproj/language.txt create mode 100644 indra/newview/pl.lproj/language.txt create mode 100644 indra/newview/pt.lproj/language.txt create mode 100644 indra/newview/ru.lproj/language.txt create mode 100644 indra/newview/skins/default/xui/da/floater_bulk_perms.xml create mode 100644 indra/newview/skins/default/xui/da/floater_font_test.xml create mode 100644 indra/newview/skins/default/xui/da/floater_perm_prefs.xml create mode 100644 indra/newview/skins/default/xui/da/floater_statistics.xml create mode 100644 indra/newview/skins/default/xui/da/menu_mini_map.xml create mode 100644 indra/newview/tr.lproj/language.txt create mode 100644 indra/newview/uk.lproj/language.txt create mode 100644 indra/newview/zh-Hans.lproj/language.txt diff --git a/indra/newview/da.lproj/language.txt b/indra/newview/da.lproj/language.txt new file mode 100644 index 0000000000..316d25d903 --- /dev/null +++ b/indra/newview/da.lproj/language.txt @@ -0,0 +1 @@ +da \ No newline at end of file diff --git a/indra/newview/es.lproj/language.txt b/indra/newview/es.lproj/language.txt new file mode 100644 index 0000000000..6c4381495c --- /dev/null +++ b/indra/newview/es.lproj/language.txt @@ -0,0 +1 @@ +es \ No newline at end of file diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 05bdf64b42..d557df3d92 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -1,4 +1,4 @@ -version 19 +version 20 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table @@ -245,6 +245,7 @@ RenderVBOEnable 1 0 list Intel RenderAnisotropic 1 0 RenderLightingDetail 1 0 +RenderUseImpostors 0 0 list GeForce2 RenderAnisotropic 1 0 diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index 09105b8d88..57d712ede7 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -1,4 +1,4 @@ -version 19 +version 20 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index fd2496d8ad..15974c0691 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 19 +version 20 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/fr.lproj/language.txt b/indra/newview/fr.lproj/language.txt new file mode 100644 index 0000000000..717280ac26 --- /dev/null +++ b/indra/newview/fr.lproj/language.txt @@ -0,0 +1 @@ +fr \ No newline at end of file diff --git a/indra/newview/hu.lproj/language.txt b/indra/newview/hu.lproj/language.txt new file mode 100644 index 0000000000..6c604cf2a9 --- /dev/null +++ b/indra/newview/hu.lproj/language.txt @@ -0,0 +1 @@ +hu \ No newline at end of file diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi index d23615de91..008c240ed7 100644 Binary files a/indra/newview/installers/windows/lang_fr.nsi and b/indra/newview/installers/windows/lang_fr.nsi differ diff --git a/indra/newview/it.lproj/language.txt b/indra/newview/it.lproj/language.txt new file mode 100644 index 0000000000..c91971434c --- /dev/null +++ b/indra/newview/it.lproj/language.txt @@ -0,0 +1 @@ +it \ No newline at end of file diff --git a/indra/newview/llappviewermacosx.h b/indra/newview/llappviewermacosx.h index 0928916a57..bc841fc3a7 100644 --- a/indra/newview/llappviewermacosx.h +++ b/indra/newview/llappviewermacosx.h @@ -55,7 +55,6 @@ protected: virtual void handleSyncCrashTrace(); std::string generateSerialNumber(); - virtual bool initLogging(); virtual bool initParseCommandLine(LLCommandLineParser& clp); }; diff --git a/indra/newview/lldrawpoolsky.h b/indra/newview/lldrawpoolsky.h index f35b114730..8595d73aee 100644 --- a/indra/newview/lldrawpoolsky.h +++ b/indra/newview/lldrawpoolsky.h @@ -36,14 +36,12 @@ #include "lldrawpool.h" class LLSkyTex; -class LLHeavenBody; class LLGLSLShader; class LLDrawPoolSky : public LLFacePool { private: LLSkyTex *mSkyTex; - LLHeavenBody *mHB[2]; // Sun and Moon LLGLSLShader *mShader; public: @@ -69,8 +67,6 @@ public: /*virtual*/ void renderForSelect(); /*virtual*/ void endRenderPass(S32 pass); void setSkyTex(LLSkyTex* const st) { mSkyTex = st; } - void setSun(LLHeavenBody* sun_flag) { mHB[0] = sun_flag; } - void setMoon(LLHeavenBody* moon) { mHB[1] = moon; } void renderSkyCubeFace(U8 side); void renderHeavenlyBody(U8 hb, LLFace* face); diff --git a/indra/newview/nl.lproj/language.txt b/indra/newview/nl.lproj/language.txt new file mode 100644 index 0000000000..d5f5c2a19c --- /dev/null +++ b/indra/newview/nl.lproj/language.txt @@ -0,0 +1 @@ +nl \ No newline at end of file diff --git a/indra/newview/pl.lproj/language.txt b/indra/newview/pl.lproj/language.txt new file mode 100644 index 0000000000..55239f3c18 --- /dev/null +++ b/indra/newview/pl.lproj/language.txt @@ -0,0 +1 @@ +pl \ No newline at end of file diff --git a/indra/newview/pt.lproj/language.txt b/indra/newview/pt.lproj/language.txt new file mode 100644 index 0000000000..9e3340eca2 --- /dev/null +++ b/indra/newview/pt.lproj/language.txt @@ -0,0 +1 @@ +pt \ No newline at end of file diff --git a/indra/newview/ru.lproj/language.txt b/indra/newview/ru.lproj/language.txt new file mode 100644 index 0000000000..adc719b423 --- /dev/null +++ b/indra/newview/ru.lproj/language.txt @@ -0,0 +1 @@ +ru \ No newline at end of file diff --git a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml index d2c8f3a003..f93f0a3525 100644 --- a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml @@ -1,15 +1,40 @@ - + - - Skriv en del eller hele navnet på beboeren: - -