From 61d2caee9f9474a6ccb6c13a4727e3527bd7c938 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Mon, 22 Mar 2010 21:47:56 +0200 Subject: Fixed bug EXT-6446 (Profile Real World description gets messed up if out of the old characters' number limit). Submitting on behalf of Dmitry Zaporozhan. Reviewed by me and Richard: https://codereview.productengine.com/secondlife/r/67/ --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_edit_profile.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 26be8440e7..dff2b9a214 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -146,7 +146,7 @@ layout="topleft" left="123" top="25" - max_length="512" + max_length="511" name="sl_description_edit" width="157" word_wrap="true"> @@ -200,7 +200,7 @@ height="102" layout="topleft" left="123" - max_length="512" + max_length="254" top="157" name="fl_description_edit" width="157" -- cgit v1.2.3 From 32fc74d06dd0c17d25d9af2f6c95b712f7f7f175 Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Mon, 22 Mar 2010 22:23:42 -0400 Subject: Updated art for Buy L$ --- .../skins/default/textures/navbar/BuyArrow_Over.png | Bin 508 -> 294 bytes .../skins/default/textures/navbar/BuyArrow_Press.png | Bin 2949 -> 294 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png index 95913dd55b..0b3f252ccf 100644 Binary files a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png and b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png differ diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png index a02675502a..5c4c150bed 100644 Binary files a/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png and b/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png differ -- cgit v1.2.3 From 7b9dc9f8d72d9eb25e1dbc06f78f2fc81ac64ae0 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 23 Mar 2010 13:57:42 +0000 Subject: CID-452 Checker: FORWARD_NULL Function: LLLandmarksPanel::isActionEnabled(const LLSD &) const File: /indra/newview/llpanellandmarks.cpp --- indra/newview/llpanellandmarks.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 4842fcac38..e3b8581aca 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -946,7 +946,8 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const ) { // disable some commands for multi-selection. EXT-1757 - if (root_folder_view->getSelectedCount() > 1) + if (root_folder_view && + root_folder_view->getSelectedCount() > 1) { return false; } -- cgit v1.2.3 From a375db6d756ceccae79eea17a0c261a361fce040 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 23 Mar 2010 13:58:41 +0000 Subject: CID-451 Checker: FORWARD_NULL Function: LLPanelPicks::onPanelClassifiedSave(LLPanelClassifiedEdit *) File: /indra/newview/llpanelpicks.cpp --- indra/newview/llpanelpicks.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 0a7c39db46..4c254de063 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -827,7 +827,11 @@ void LLPanelPicks::onPanelClassifiedSave(LLPanelClassifiedEdit* panel) else if(panel->isNewWithErrors()) { LLClassifiedItem* c_item = dynamic_cast(mClassifiedsList->getSelectedItem()); - c_item->fillIn(panel); + llassert(c_item); + if (c_item) + { + c_item->fillIn(panel); + } } else { -- cgit v1.2.3 From af77b7713444b9df58f451bdb1f30bdd4754fcbf Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 23 Mar 2010 14:02:41 +0000 Subject: CID-450 Checker: FORWARD_NULL Function: LLPanelPicks::onPanelClassifiedEdit() File: /indra/newview/llpanelpicks.cpp --- indra/newview/llpanelpicks.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 4c254de063..6f920cf4b9 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -974,6 +974,11 @@ void LLPanelPicks::onPanelClassifiedEdit() } LLClassifiedItem* c_item = dynamic_cast(mClassifiedsList->getSelectedItem()); + llassert(c_item); + if (!c_item) + { + return; + } LLSD params; params["classified_id"] = c_item->getClassifiedId(); -- cgit v1.2.3 From 0b3099fbca36be1012ddaeaf1e6cd5673caa1aca Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Tue, 23 Mar 2010 14:45:01 +0000 Subject: Minimal fix for EXT-6508, restore voice volume when unmuting. Ignore incoming volume level of zero from SLVoice. (May also fix EXT-5625, though unconfirmed, removes obsolete hack that was obfuscating that issue). --- indra/newview/llinspectavatar.cpp | 8 -------- indra/newview/llvoiceclient.cpp | 10 +++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 14bc4376fe..35cb9b3468 100644 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -564,7 +564,6 @@ void LLInspectAvatar::updateVolumeSlider() LLUICtrl* volume_slider = getChild("volume_slider"); volume_slider->setEnabled( !is_muted ); - const F32 DEFAULT_VOLUME = 0.5f; F32 volume; if (is_muted) { @@ -575,13 +574,6 @@ void LLInspectAvatar::updateVolumeSlider() { // actual volume volume = gVoiceClient->getUserVolume(mAvatarID); - - // *HACK: Voice client doesn't have any data until user actually - // says something. - if (volume == 0.f) - { - volume = DEFAULT_VOLUME; - } } volume_slider->setValue( (F64)volume ); } diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 5ba13efca2..9bb85d2bd5 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -4598,7 +4598,15 @@ void LLVoiceClient::participantUpdatedEvent( { participant->mPower = 0.0f; } - participant->mVolume = volume; + + // *HACK: Minimal hack to fix EXT-6508, ignore the incoming volume if it is zero. + // This happens because we send volume zero to Vivox when someone is muted, + // Vivox then send it back to us, overwriting the previous volume. + // Remove this hack once volume refactoring from EXT-6031 is applied. + if (volume != 0) + { + participant->mVolume = volume; + } // *HACK: mantipov: added while working on EXT-3544 -- cgit v1.2.3