From 2a3c30dc7ce2be59f168f8c02d0e86e2ae916959 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 19 Mar 2010 11:48:00 -0400 Subject: EXT-6479 : Inspect Object floater doesn't update highlight and selection EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset) Very simple fix that addresses some brokenness with the inspect multi-object floater. Nature of changes is that when we re-enabled the floater (i.e. uncommented the associated code) per last-minute request, a couple of blocks of code had been left commented out. --- indra/newview/llselectmgr.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index d733574a9d..c4ca4a65f8 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -4936,17 +4936,18 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) if (mSelectedObjects->getNumNodes()) { LLUUID inspect_item_id= LLUUID::null; -#if 0 LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance("inspect"); if(inspect_instance) { inspect_item_id = inspect_instance->getSelectedUUID(); } -#endif - LLSidepanelTaskInfo *panel_task_info = LLSidepanelTaskInfo::getActivePanel(); - if (panel_task_info) + else { - inspect_item_id = panel_task_info->getSelectedUUID(); + LLSidepanelTaskInfo *panel_task_info = LLSidepanelTaskInfo::getActivePanel(); + if (panel_task_info) + { + inspect_item_id = panel_task_info->getSelectedUUID(); + } } LLUUID focus_item_id = LLViewerMediaFocus::getInstance()->getFocusedObjectID(); @@ -5534,13 +5535,12 @@ void dialog_refresh_all() LLFloaterProperties::dirtyAll(); -#if 0 LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance("inspect"); if(inspect_instance) { inspect_instance->dirty(); } -#endif + LLSidepanelTaskInfo *panel_task_info = LLSidepanelTaskInfo::getActivePanel(); if (panel_task_info) { -- cgit v1.2.3 From f50be64167c254e27f635ad47d8940551f0c6ab4 Mon Sep 17 00:00:00 2001 From: "Karl Stiefvater (qarl)" Date: Fri, 19 Mar 2010 12:09:06 -0500 Subject: EXT-6421 [crashhunters] Crash in LLViewerObject::getBoundingBoxAgent() added null guard to fix crash when the xform has no parent. reviewed by davep. --- indra/newview/llviewerobject.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index b5642d07a5..6c8346df86 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4029,7 +4029,8 @@ LLBBox LLViewerObject::getBoundingBoxAgent() const avatar_parent = (LLViewerObject*)root_edit->getParent(); } - if (avatar_parent && avatar_parent->isAvatar() && root_edit && root_edit->mDrawable.notNull()) + if (avatar_parent && avatar_parent->isAvatar() && + root_edit && root_edit->mDrawable.notNull() && root_edit->mDrawable->getXform()->getParent()) { LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent(); position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition(); -- cgit v1.2.3 From b952a5e5851d1a8bc2a45f00248b051497fec71f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 19 Mar 2010 13:21:39 -0400 Subject: EXT-6479 : Inspect Object floater doesn't update highlight and selection EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset) Simple fix to only use Inspect floater if it's actually active (i.e. visible). --- indra/newview/llselectmgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index c4ca4a65f8..9147bd1cba 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -4937,7 +4937,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) { LLUUID inspect_item_id= LLUUID::null; LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance("inspect"); - if(inspect_instance) + if(inspect_instance && inspect_instance->getVisible()) { inspect_item_id = inspect_instance->getSelectedUUID(); } -- cgit v1.2.3 From 107e076c83caf1d0163f5a0a3c0d3ee0b8ed1e56 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Fri, 19 Mar 2010 17:40:39 +0000 Subject: EXT-6486 Update Vivox SDK to 3.1.0001.8181 New Vivox SDK release to fix three main crash issues discovered through automatic crash reporting to Vivox enabled in Beta 4, along with extra diagnostics to help track down the cause of SLVoice failing to exit. --- install.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install.xml b/install.xml index 7337241cf8..51aa199282 100644 --- a/install.xml +++ b/install.xml @@ -1386,23 +1386,23 @@ anguage Infrstructure (CLI) international standard darwin md5sum - bce6f58d3d63bda049bb7059583ed8e8 + 38d836fa53d073b9f197eecd0f5615f0 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-darwin-20100225.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-darwin-20100319.tar.bz2 linux md5sum - 12aac7288af3565ac2730796cb6d8de6 + dd8dd1c223ecb8b232bf626cca6c63ac url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-linux-20100225.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-linux-20100319.tar.bz2 windows md5sum - 8af04ae8c536e8db80f67e6e5305fb61 + 8b4ce60f25823cd38896cb3b7eb0dd43 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-windows-20100225.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-windows-20100319.tar.bz2 -- cgit v1.2.3 From 8cd1f7d1e158632ef5d7f01b685105647e42b56f Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Fri, 19 Mar 2010 11:11:42 -0700 Subject: FR linguistic; CT-575 IT set7 translation for beta 5 --- .../default/xui/fr/floater_day_cycle_options.xml | 2 +- .../skins/default/xui/fr/mime_types_linux.xml | 2 +- .../skins/default/xui/fr/mime_types_mac.xml | 2 +- .../default/xui/fr/panel_prim_media_controls.xml | 2 +- .../newview/skins/default/xui/it/floater_about.xml | 16 +- .../skins/default/xui/it/floater_about_land.xml | 22 +- .../default/xui/it/floater_animation_preview.xml | 3 + .../default/xui/it/floater_avatar_textures.xml | 55 +-- .../skins/default/xui/it/floater_bulk_perms.xml | 2 +- .../skins/default/xui/it/floater_buy_currency.xml | 2 +- .../skins/default/xui/it/floater_buy_land.xml | 258 ++++++------- .../skins/default/xui/it/floater_color_picker.xml | 2 +- .../skins/default/xui/it/floater_customize.xml | 108 +++--- .../skins/default/xui/it/floater_help_browser.xml | 7 +- indra/newview/skins/default/xui/it/floater_im.xml | 2 +- .../skins/default/xui/it/floater_im_container.xml | 2 +- .../skins/default/xui/it/floater_incoming_call.xml | 6 + .../skins/default/xui/it/floater_inventory.xml | 8 +- .../default/xui/it/floater_live_lsleditor.xml | 2 +- .../skins/default/xui/it/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/it/floater_map.xml | 2 +- .../skins/default/xui/it/floater_media_browser.xml | 8 +- .../skins/default/xui/it/floater_moveview.xml | 4 +- .../skins/default/xui/it/floater_outgoing_call.xml | 12 + .../skins/default/xui/it/floater_pay_object.xml | 2 +- .../skins/default/xui/it/floater_preferences.xml | 2 +- .../default/xui/it/floater_preview_animation.xml | 2 +- .../default/xui/it/floater_preview_gesture.xml | 3 + .../default/xui/it/floater_preview_notecard.xml | 6 +- .../skins/default/xui/it/floater_preview_sound.xml | 2 +- .../default/xui/it/floater_preview_texture.xml | 7 +- .../skins/default/xui/it/floater_report_abuse.xml | 4 +- .../default/xui/it/floater_script_preview.xml | 2 +- .../skins/default/xui/it/floater_select_key.xml | 2 +- .../default/xui/it/floater_settings_debug.xml | 8 +- .../skins/default/xui/it/floater_snapshot.xml | 21 +- .../skins/default/xui/it/floater_sys_well.xml | 2 +- .../skins/default/xui/it/floater_texture_ctrl.xml | 2 +- .../skins/default/xui/it/floater_top_objects.xml | 69 ++-- .../default/xui/it/floater_voice_controls.xml | 17 +- .../default/xui/it/floater_wearable_save_as.xml | 2 +- .../default/xui/it/floater_whitelist_entry.xml | 2 +- .../skins/default/xui/it/floater_world_map.xml | 69 +--- .../skins/default/xui/it/inspect_avatar.xml | 2 +- .../skins/default/xui/it/menu_avatar_self.xml | 8 +- .../default/xui/it/menu_inspect_avatar_gear.xml | 2 + .../skins/default/xui/it/menu_inventory.xml | 11 +- .../skins/default/xui/it/menu_inventory_add.xml | 2 +- indra/newview/skins/default/xui/it/menu_login.xml | 2 +- indra/newview/skins/default/xui/it/menu_object.xml | 12 +- .../skins/default/xui/it/menu_participant_list.xml | 18 +- .../skins/default/xui/it/menu_people_nearby.xml | 3 + .../xui/it/menu_people_nearby_multiselect.xml | 1 + .../skins/default/xui/it/menu_profile_overflow.xml | 6 + indra/newview/skins/default/xui/it/menu_viewer.xml | 80 ++-- .../newview/skins/default/xui/it/notifications.xml | 191 +++++----- .../default/xui/it/panel_adhoc_control_panel.xml | 16 +- .../default/xui/it/panel_avatar_list_item.xml | 1 + .../default/xui/it/panel_block_list_sidetray.xml | 6 +- .../skins/default/xui/it/panel_bottomtray.xml | 17 +- .../skins/default/xui/it/panel_classified_info.xml | 17 +- .../skins/default/xui/it/panel_edit_profile.xml | 5 +- .../newview/skins/default/xui/it/panel_friends.xml | 2 +- .../default/xui/it/panel_group_control_panel.xml | 20 +- .../skins/default/xui/it/panel_group_general.xml | 24 +- .../default/xui/it/panel_group_info_sidetray.xml | 43 ++- .../skins/default/xui/it/panel_group_invite.xml | 10 +- .../default/xui/it/panel_group_land_money.xml | 106 +++--- .../skins/default/xui/it/panel_group_list_item.xml | 1 + .../skins/default/xui/it/panel_group_notices.xml | 4 +- .../skins/default/xui/it/panel_group_notify.xml | 2 +- .../skins/default/xui/it/panel_group_roles.xml | 4 +- .../default/xui/it/panel_im_control_panel.xml | 36 +- .../skins/default/xui/it/panel_landmark_info.xml | 1 + .../skins/default/xui/it/panel_landmarks.xml | 2 +- indra/newview/skins/default/xui/it/panel_login.xml | 34 +- .../skins/default/xui/it/panel_main_inventory.xml | 2 +- indra/newview/skins/default/xui/it/panel_me.xml | 4 +- .../xui/it/panel_media_settings_security.xml | 6 +- .../skins/default/xui/it/panel_my_profile.xml | 58 ++- .../skins/default/xui/it/panel_navigation_bar.xml | 9 +- indra/newview/skins/default/xui/it/panel_notes.xml | 2 +- .../default/xui/it/panel_outfits_inventory.xml | 17 +- .../it/panel_outfits_inventory_gear_default.xml | 4 +- .../newview/skins/default/xui/it/panel_people.xml | 18 +- .../skins/default/xui/it/panel_place_profile.xml | 57 +-- .../newview/skins/default/xui/it/panel_places.xml | 11 +- .../default/xui/it/panel_preferences_advanced.xml | 41 +- .../default/xui/it/panel_preferences_alerts.xml | 6 +- .../default/xui/it/panel_preferences_chat.xml | 12 +- .../default/xui/it/panel_preferences_general.xml | 19 +- .../default/xui/it/panel_preferences_graphics1.xml | 4 +- .../default/xui/it/panel_preferences_privacy.xml | 7 +- .../default/xui/it/panel_preferences_setup.xml | 22 +- .../default/xui/it/panel_preferences_sound.xml | 17 +- .../default/xui/it/panel_prim_media_controls.xml | 61 ++- .../newview/skins/default/xui/it/panel_profile.xml | 64 ++-- .../skins/default/xui/it/panel_region_covenant.xml | 2 +- .../skins/default/xui/it/panel_region_estate.xml | 9 +- .../skins/default/xui/it/panel_region_texture.xml | 4 +- .../skins/default/xui/it/panel_side_tray.xml | 23 +- .../skins/default/xui/it/panel_status_bar.xml | 6 +- .../default/xui/it/panel_teleport_history.xml | 4 + .../skins/default/xui/it/sidepanel_appearance.xml | 11 +- .../skins/default/xui/it/sidepanel_item_info.xml | 55 +-- .../skins/default/xui/it/sidepanel_task_info.xml | 97 ++--- indra/newview/skins/default/xui/it/strings.xml | 418 +++++++++++---------- 107 files changed, 1283 insertions(+), 1231 deletions(-) diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml index 15cc6cd1ba..951670ec7e 100644 --- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml @@ -84,7 +84,7 @@ Prévisualiser : -