From e360a444648dfa57c446e7714ea7eaf4db4a1d44 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Sat, 7 Nov 2009 17:20:52 +0200 Subject: Fixed normal bug EXT-2314 "Restore maturity rating in "Landmark" and "Teleport History" views": - Added rating icons and text to "Landmark" and "Teleport History" views. - Removed code for "Last Visited" from Teleport History. --HG-- branch : product-engine --- indra/newview/llpanelplaceinfo.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'indra/newview/llpanelplaceinfo.cpp') diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp index c600651015..906f8d084b 100644 --- a/indra/newview/llpanelplaceinfo.cpp +++ b/indra/newview/llpanelplaceinfo.cpp @@ -40,6 +40,7 @@ #include "llsdutil_math.h" +#include "lliconctrl.h" #include "llscrollcontainer.h" #include "lltextbox.h" @@ -81,6 +82,7 @@ BOOL LLPanelPlaceInfo::postBuild() mParcelName = getChild("parcel_title"); mDescEditor = getChild("description"); + mMaturityRatingIcon = getChild("maturity_icon"); mMaturityRatingText = getChild("maturity_value"); LLScrollContainer* scroll_container = getChild("place_scroll"); @@ -98,6 +100,7 @@ void LLPanelPlaceInfo::resetLocation() mPosRegion.clearVec(); std::string not_available = getString("not_available"); + mMaturityRatingIcon->setValue(not_available); mMaturityRatingText->setValue(not_available); mRegionName->setText(not_available); mParcelName->setText(not_available); @@ -204,20 +207,6 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data) mDescEditor->setText(parcel_data.desc); } - // HACK: Flag 0x2 == adult region, - // Flag 0x1 == mature region, otherwise assume PG - std::string rating = LLViewerRegion::accessToString(SIM_ACCESS_PG); - if (parcel_data.flags & 0x2) - { - rating = LLViewerRegion::accessToString(SIM_ACCESS_ADULT); - } - else if (parcel_data.flags & 0x1) - { - rating = LLViewerRegion::accessToString(SIM_ACCESS_MATURE); - } - - mMaturityRatingText->setValue(rating); - S32 region_x; S32 region_y; S32 region_z; -- cgit v1.2.3 From 9c5d1fd3bd9f9cfb20341b9fb7b1046784206432 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Mon, 9 Nov 2009 18:50:55 +0200 Subject: - Reverted fix for normal bug EXT-2016 "Place Profile panel isn't resized". The reason is that some unnecessary free space is left in Place Profile panel. - Cleaned up obsolete code from Place Profile panel. --HG-- branch : product-engine --- indra/newview/llpanelplaceinfo.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'indra/newview/llpanelplaceinfo.cpp') diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp index 906f8d084b..963d39de8a 100644 --- a/indra/newview/llpanelplaceinfo.cpp +++ b/indra/newview/llpanelplaceinfo.cpp @@ -41,7 +41,6 @@ #include "llsdutil_math.h" #include "lliconctrl.h" -#include "llscrollcontainer.h" #include "lltextbox.h" #include "llagent.h" @@ -58,8 +57,7 @@ LLPanelPlaceInfo::LLPanelPlaceInfo() : LLPanel(), mParcelID(), mRequestedID(), - mPosRegion(), - mMinHeight(0) + mPosRegion() {} //virtual @@ -85,10 +83,6 @@ BOOL LLPanelPlaceInfo::postBuild() mMaturityRatingIcon = getChild("maturity_icon"); mMaturityRatingText = getChild("maturity_value"); - LLScrollContainer* scroll_container = getChild("place_scroll"); - scroll_container->setBorderVisible(FALSE); - mMinHeight = scroll_container->getScrolledViewRect().getHeight(); - return TRUE; } -- cgit v1.2.3