From 4e28c10971dc4f9a52a7b3f109143dbce3528d21 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Mon, 8 Feb 2010 14:11:24 +0200 Subject: Fixed major bug (EXT-5017) Landmark Info panel opens immediately after retrieving data about landmarking location. --HG-- branch : product-engine --- indra/newview/llpanelplaces.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llpanelplaces.cpp') diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index a49386cb5c..c0491cc00f 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -1023,7 +1023,6 @@ void LLPanelPlaces::showAddedLandmarkInfo(const std::vector& items) { setItem(item); } - break; } } } -- cgit v1.2.3 From bf2aad17ac9fba1da60c209f81b8659ee4649bd0 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 10 Feb 2010 17:19:38 +0000 Subject: CID-421 Checker: NULL_RETURNS Function: LLPanelPlaces::showAddedLandmarkInfo(const std::vector> &) File: /indra/newview/llpanelplaces.cpp --- indra/newview/llpanelplaces.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelplaces.cpp') diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index c0491cc00f..17a970cfcf 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -1015,7 +1015,8 @@ void LLPanelPlaces::showAddedLandmarkInfo(const std::vector& items) LLInventoryItem* item = gInventory.getItem(item_id); - if (LLAssetType::AT_LANDMARK == item->getType()) + llassert(item); + if (item && (LLAssetType::AT_LANDMARK == item->getType()) ) { // Created landmark is passed to Places panel to allow its editing. // If the panel is closed we don't reopen it until created landmark is loaded. -- cgit v1.2.3 From d3bde04a8c3a2cd142bb75dbcad577d083aad0d1 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Wed, 10 Feb 2010 22:05:37 +0200 Subject: Fixed normal bug (EXT-5111) Mysterious disabled arrow widget on Places tab. --HG-- branch : product-engine --- indra/newview/llpanelplaces.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llpanelplaces.cpp') diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index c0491cc00f..0855e5ca28 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -1047,14 +1047,13 @@ void LLPanelPlaces::updateVerbs() mTeleportBtn->setVisible(!is_create_landmark_visible && !isLandmarkEditModeOn); mShowOnMapBtn->setVisible(!is_create_landmark_visible && !isLandmarkEditModeOn); - mOverflowBtn->setVisible(!is_create_landmark_visible && !isLandmarkEditModeOn); + mOverflowBtn->setVisible(is_place_info_visible && !is_create_landmark_visible && !isLandmarkEditModeOn); mEditBtn->setVisible(mPlaceInfoType == LANDMARK_INFO_TYPE && !isLandmarkEditModeOn); mSaveBtn->setVisible(isLandmarkEditModeOn); mCancelBtn->setVisible(isLandmarkEditModeOn); mCloseBtn->setVisible(is_create_landmark_visible && !isLandmarkEditModeOn); mShowOnMapBtn->setEnabled(!is_create_landmark_visible && !isLandmarkEditModeOn && have_3d_pos); - mOverflowBtn->setEnabled(is_place_info_visible && !is_create_landmark_visible); if (is_place_info_visible) { -- cgit v1.2.3