From c70b05082f7175a43f0957fabcba1f0a2581471c Mon Sep 17 00:00:00 2001 From: gabriel lee Date: Mon, 9 Aug 2010 12:44:28 +0100 Subject: patching from fixes made in dessie/viewer-release --- indra/newview/llpanellandmarks.cpp | 3 +++ indra/newview/llpanelpick.cpp | 3 +++ indra/newview/llpanelplace.cpp | 3 +++ indra/newview/llpanelplaceinfo.cpp | 4 ++++ 4 files changed, 13 insertions(+) (limited to 'indra') diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index ce1131f45c..46c64ec45b 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -522,6 +522,9 @@ void LLLandmarksPanel::setParcelID(const LLUUID& parcel_id) { if (!parcel_id.isNull()) { + //ext-4655, defensive. remove now incase this gets called twice without a remove + LLRemoteParcelInfoProcessor::getInstance()->removeObserver(parcel_id, this); + LLRemoteParcelInfoProcessor::getInstance()->addObserver(parcel_id, this); LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(parcel_id); } diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index f0dc493ebe..423dbfe9db 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -210,6 +210,9 @@ void LLPanelPickInfo::sendParcelInfoRequest() { if (mParcelId != mRequestedId) { + //ext-4655, remove now incase this gets called twice without a remove + LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedId, this); + LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelId, this); LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelId); diff --git a/indra/newview/llpanelplace.cpp b/indra/newview/llpanelplace.cpp index 1446088c4f..0b189df08d 100644 --- a/indra/newview/llpanelplace.cpp +++ b/indra/newview/llpanelplace.cpp @@ -202,6 +202,9 @@ void LLPanelPlace::sendParcelInfoRequest() { if (mParcelID != mRequestedID) { + //ext-4655, remove now incase this gets called twice without a remove + LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedID, this); + LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelID, this); LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelID); diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp index 99e48cca6d..10e2c1e080 100644 --- a/indra/newview/llpanelplaceinfo.cpp +++ b/indra/newview/llpanelplaceinfo.cpp @@ -133,6 +133,10 @@ void LLPanelPlaceInfo::sendParcelInfoRequest() { if (mParcelID != mRequestedID) { + //ext-4655, defensive. remove now incase this gets called twice without a remove + //as panel never closes its ok atm (but wrong :) + LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mRequestedID, this); + LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelID, this); LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelID); -- cgit v1.2.3 From 90a73085fda47da5c966f246e96667f8c11d9579 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 9 Aug 2010 16:14:12 +0100 Subject: EXT-8597 FIXED [crashhunters] LLVorbisDecodeState::initDecode() not for certain fixed, but some robustification. --- indra/llaudio/llaudiodecodemgr.cpp | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'indra') diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 290206ee22..fc2190707a 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -230,19 +230,29 @@ BOOL LLVorbisDecodeState::initDecode() bool abort_decode = false; - if( vi->channels < 1 || vi->channels > LLVORBIS_CLIP_MAX_CHANNELS ) + if (vi) + { + if( vi->channels < 1 || vi->channels > LLVORBIS_CLIP_MAX_CHANNELS ) + { + abort_decode = true; + llwarns << "Bad channel count: " << vi->channels << llendl; + } + } + else // !vi { abort_decode = true; - llwarns << "Bad channel count: " << vi->channels << llendl; + llwarns << "No default bitstream found" << llendl; } - if( (size_t)sample_count > LLVORBIS_CLIP_REJECT_SAMPLES ) + if( (size_t)sample_count > LLVORBIS_CLIP_REJECT_SAMPLES || + (size_t)sample_count <= 0) { abort_decode = true; llwarns << "Illegal sample count: " << sample_count << llendl; } - if( size_guess > LLVORBIS_CLIP_REJECT_SIZE ) + if( size_guess > LLVORBIS_CLIP_REJECT_SIZE || + size_guess < 0) { abort_decode = true; llwarns << "Illegal sample size: " << size_guess << llendl; @@ -251,7 +261,11 @@ BOOL LLVorbisDecodeState::initDecode() if( abort_decode ) { llwarns << "Canceling initDecode. Bad asset: " << mUUID << llendl; - llwarns << "Bad asset encoded by: " << ov_comment(&mVF,-1)->vendor << llendl; + vorbis_comment* comment = ov_comment(&mVF,-1); + if (comment && comment->vendor) + { + llwarns << "Bad asset encoded by: " << comment->vendor << llendl; + } delete mInFilep; mInFilep = NULL; return FALSE; -- cgit v1.2.3 From e56bd45f0dbf58ace9cfc5965885521a0740e205 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Mon, 9 Aug 2010 15:06:26 -0700 Subject: CT-575 WIP PL global edit part 1/2; PL DA set 16 translation for 2.1.1; FR linguistic --- .../default/xui/da/floater_preview_gesture.xml | 7 +- .../skins/default/xui/da/floater_world_map.xml | 11 ++- indra/newview/skins/default/xui/da/menu_viewer.xml | 2 +- .../newview/skins/default/xui/da/notifications.xml | 9 ++- .../skins/default/xui/da/panel_group_notices.xml | 2 +- .../skins/default/xui/da/panel_group_roles.xml | 18 ++--- .../skins/default/xui/da/panel_nearby_media.xml | 14 ++-- .../default/xui/da/panel_preferences_sound.xml | 10 ++- .../default/xui/da/panel_teleport_history.xml | 3 +- .../skins/default/xui/da/sidepanel_item_info.xml | 13 ++-- indra/newview/skins/default/xui/da/strings.xml | 89 +++++++++++++++++++++- .../skins/default/xui/fr/floater_about_land.xml | 2 +- .../default/xui/fr/floater_day_cycle_options.xml | 4 +- .../skins/default/xui/fr/floater_postcard.xml | 4 +- .../newview/skins/default/xui/fr/floater_tools.xml | 10 +-- .../newview/skins/default/xui/fr/notifications.xml | 2 +- .../skins/default/xui/fr/panel_group_notices.xml | 2 +- .../skins/default/xui/fr/panel_landmarks.xml | 2 +- indra/newview/skins/default/xui/fr/strings.xml | 8 +- .../skins/default/xui/pl/floater_about_land.xml | 10 +-- .../default/xui/pl/floater_animation_preview.xml | 28 +++---- .../default/xui/pl/floater_avatar_textures.xml | 3 +- .../skins/default/xui/pl/floater_bulk_perms.xml | 2 +- .../skins/default/xui/pl/floater_camera.xml | 4 +- .../skins/default/xui/pl/floater_customize.xml | 8 +- .../default/xui/pl/floater_day_cycle_options.xml | 2 +- .../newview/skins/default/xui/pl/floater_event.xml | 6 +- .../skins/default/xui/pl/floater_gesture.xml | 4 +- .../skins/default/xui/pl/floater_god_tools.xml | 26 +++---- .../skins/default/xui/pl/floater_image_preview.xml | 12 +-- .../skins/default/xui/pl/floater_inventory.xml | 2 +- .../default/xui/pl/floater_preview_gesture.xml | 7 +- .../skins/default/xui/pl/floater_world_map.xml | 11 ++- indra/newview/skins/default/xui/pl/menu_viewer.xml | 2 +- .../newview/skins/default/xui/pl/notifications.xml | 9 ++- .../skins/default/xui/pl/panel_group_roles.xml | 18 ++--- .../skins/default/xui/pl/panel_nearby_media.xml | 6 +- .../default/xui/pl/panel_preferences_sound.xml | 12 ++- .../default/xui/pl/panel_teleport_history.xml | 3 +- .../skins/default/xui/pl/sidepanel_item_info.xml | 17 ++--- indra/newview/skins/default/xui/pl/strings.xml | 89 +++++++++++++++++++++- 41 files changed, 340 insertions(+), 153 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml index a26f2f95c9..bd2b194717 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml @@ -42,7 +42,12 @@ Type: - + + + + + +