From b43da6721e538290962cafa7ddd32a8f4c7e21db Mon Sep 17 00:00:00 2001 From: Dave SIMmONs Date: Fri, 6 May 2011 18:29:43 -0700 Subject: Viewer UI work to add icons for the nav bar and places profile to indicate parcel privacy settings. Using engineering art icons. --- indra/newview/llpanelplaceprofile.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'indra/newview/llpanelplaceprofile.cpp') diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp index 68ecb0165c..da6a9fbbc6 100644 --- a/indra/newview/llpanelplaceprofile.cpp +++ b/indra/newview/llpanelplaceprofile.cpp @@ -70,6 +70,8 @@ static std::string icon_scripts; static std::string icon_scripts_no; static std::string icon_damage; static std::string icon_damage_no; +static std::string icon_privacy_on; +static std::string icon_privacy_off; LLPanelPlaceProfile::LLPanelPlaceProfile() : LLPanelPlaceInfo(), @@ -114,6 +116,8 @@ BOOL LLPanelPlaceProfile::postBuild() mScriptsText = getChild("scripts_value"); mDamageIcon = getChild("damage_icon"); mDamageText = getChild("damage_value"); + mPrivacyIcon = getChild("privacy_icon"); + mPrivacyText = getChild("privacy_value"); mRegionNameText = getChild("region_name"); mRegionTypeText = getChild("region_type"); @@ -153,6 +157,8 @@ BOOL LLPanelPlaceProfile::postBuild() icon_scripts_no = getString("icon_ScriptsNo"); icon_damage = getString("icon_Damage"); icon_damage_no = getString("icon_DamageNo"); + icon_privacy_on = getString("icon_PrivacyOn"); + icon_privacy_off = getString("icon_PrivacyOff"); return TRUE; } @@ -182,6 +188,8 @@ void LLPanelPlaceProfile::resetLocation() mScriptsText->setText(loading); mDamageIcon->setValue(loading); mDamageText->setText(loading); + mPrivacyIcon->setValue(loading); + mPrivacyText->setText(loading); mRegionNameText->setValue(loading); mRegionTypeText->setValue(loading); @@ -414,6 +422,17 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel, mDamageText->setText(off); } + if (parcel->getPrivacy()) + { + mPrivacyIcon->setValue(icon_privacy_on); + mPrivacyText->setText(on); + } + else + { + mPrivacyIcon->setValue(icon_privacy_off); + mPrivacyText->setText(off); + } + mRegionNameText->setText(region->getName()); mRegionTypeText->setText(region->getSimProductName()); -- cgit v1.2.3 From 50393788693578a2fe3a934faa04b382d75f1657 Mon Sep 17 00:00:00 2001 From: Dave SIMmONs Date: Thu, 9 Jun 2011 13:46:19 -0700 Subject: ER-910: Parcel Privacy. Rename things in code to reflect feature name change to "hidden avatars" --- indra/newview/llpanelplaceprofile.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'indra/newview/llpanelplaceprofile.cpp') diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp index da6a9fbbc6..1500ac5429 100644 --- a/indra/newview/llpanelplaceprofile.cpp +++ b/indra/newview/llpanelplaceprofile.cpp @@ -70,8 +70,8 @@ static std::string icon_scripts; static std::string icon_scripts_no; static std::string icon_damage; static std::string icon_damage_no; -static std::string icon_privacy_on; -static std::string icon_privacy_off; +static std::string icon_hidden_avs_on; +static std::string icon_hidden_avs_off; LLPanelPlaceProfile::LLPanelPlaceProfile() : LLPanelPlaceInfo(), @@ -116,8 +116,8 @@ BOOL LLPanelPlaceProfile::postBuild() mScriptsText = getChild("scripts_value"); mDamageIcon = getChild("damage_icon"); mDamageText = getChild("damage_value"); - mPrivacyIcon = getChild("privacy_icon"); - mPrivacyText = getChild("privacy_value"); + mHiddenAVsIcon = getChild("hidden_av_icon"); + mHiddenAVsText = getChild("hidden_av_value"); mRegionNameText = getChild("region_name"); mRegionTypeText = getChild("region_type"); @@ -157,8 +157,8 @@ BOOL LLPanelPlaceProfile::postBuild() icon_scripts_no = getString("icon_ScriptsNo"); icon_damage = getString("icon_Damage"); icon_damage_no = getString("icon_DamageNo"); - icon_privacy_on = getString("icon_PrivacyOn"); - icon_privacy_off = getString("icon_PrivacyOff"); + icon_hidden_avs_on = getString("icon_HiddenAVsOn"); + icon_hidden_avs_off = getString("icon_HiddenAVsOff"); return TRUE; } @@ -188,8 +188,8 @@ void LLPanelPlaceProfile::resetLocation() mScriptsText->setText(loading); mDamageIcon->setValue(loading); mDamageText->setText(loading); - mPrivacyIcon->setValue(loading); - mPrivacyText->setText(loading); + mHiddenAVsIcon->setValue(loading); + mHiddenAVsText->setText(loading); mRegionNameText->setValue(loading); mRegionTypeText->setValue(loading); @@ -422,15 +422,15 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel, mDamageText->setText(off); } - if (parcel->getPrivacy()) + if (parcel->getHiddenAVs()) { - mPrivacyIcon->setValue(icon_privacy_on); - mPrivacyText->setText(on); + mHiddenAVsIcon->setValue(icon_hidden_avs_on); + mHiddenAVsText->setText(on); } else { - mPrivacyIcon->setValue(icon_privacy_off); - mPrivacyText->setText(off); + mHiddenAVsIcon->setValue(icon_hidden_avs_off); + mHiddenAVsText->setText(off); } mRegionNameText->setText(region->getName()); -- cgit v1.2.3 From 918238dd18f74ee2783d55dfb961e8f44b2f4b1b Mon Sep 17 00:00:00 2001 From: "simon@lindenlab.com" Date: Fri, 1 Jul 2011 14:06:08 -0700 Subject: ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel Privacy" changes. Many naming changes for the featureto be "See avatars" instead of "hidden avatars". Also removed the "anyone can edit terrain" checkbox and slammed the value to FALSE. --- indra/newview/llpanelplaceprofile.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'indra/newview/llpanelplaceprofile.cpp') diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp index 1500ac5429..1e9ce58237 100644 --- a/indra/newview/llpanelplaceprofile.cpp +++ b/indra/newview/llpanelplaceprofile.cpp @@ -70,8 +70,8 @@ static std::string icon_scripts; static std::string icon_scripts_no; static std::string icon_damage; static std::string icon_damage_no; -static std::string icon_hidden_avs_on; -static std::string icon_hidden_avs_off; +static std::string icon_see_avs_on; +static std::string icon_see_avs_off; LLPanelPlaceProfile::LLPanelPlaceProfile() : LLPanelPlaceInfo(), @@ -116,8 +116,8 @@ BOOL LLPanelPlaceProfile::postBuild() mScriptsText = getChild("scripts_value"); mDamageIcon = getChild("damage_icon"); mDamageText = getChild("damage_value"); - mHiddenAVsIcon = getChild("hidden_av_icon"); - mHiddenAVsText = getChild("hidden_av_value"); + mSeeAVsIcon = getChild("see_avatars_icon"); + mSeeAVsText = getChild("see_avatars_value"); mRegionNameText = getChild("region_name"); mRegionTypeText = getChild("region_type"); @@ -157,8 +157,8 @@ BOOL LLPanelPlaceProfile::postBuild() icon_scripts_no = getString("icon_ScriptsNo"); icon_damage = getString("icon_Damage"); icon_damage_no = getString("icon_DamageNo"); - icon_hidden_avs_on = getString("icon_HiddenAVsOn"); - icon_hidden_avs_off = getString("icon_HiddenAVsOff"); + icon_see_avs_on = getString("icon_SeeAVs_On"); + icon_see_avs_off = getString("icon_SeeAVs_Off"); return TRUE; } @@ -188,8 +188,8 @@ void LLPanelPlaceProfile::resetLocation() mScriptsText->setText(loading); mDamageIcon->setValue(loading); mDamageText->setText(loading); - mHiddenAVsIcon->setValue(loading); - mHiddenAVsText->setText(loading); + mSeeAVsIcon->setValue(loading); + mSeeAVsText->setText(loading); mRegionNameText->setValue(loading); mRegionTypeText->setValue(loading); @@ -422,15 +422,15 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel, mDamageText->setText(off); } - if (parcel->getHiddenAVs()) + if (parcel->getSeeAVs()) { - mHiddenAVsIcon->setValue(icon_hidden_avs_on); - mHiddenAVsText->setText(on); + mSeeAVsIcon->setValue(icon_see_avs_on); + mSeeAVsText->setText(on); } else { - mHiddenAVsIcon->setValue(icon_hidden_avs_off); - mHiddenAVsText->setText(off); + mSeeAVsIcon->setValue(icon_see_avs_off); + mSeeAVsText->setText(off); } mRegionNameText->setText(region->getName()); -- cgit v1.2.3 From e67bc887377c7a2eecaa2135c3e6c0f27724f3b5 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 22 Jul 2011 17:35:05 +0300 Subject: STORM-1311 FIXED Provide more space for parcel description in the Place Profile when coming from search. This also affects the way teleport history items look. In the first place I tried to make the description occupy all available space and follow viewer window shape. However that triggered numerous bugs in the text widgets, which spoiled the whole fix. So I'm coming up with a temporary hacky solution that should fit the ticket requirements. --- indra/newview/llpanelplaceprofile.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'indra/newview/llpanelplaceprofile.cpp') diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp index 1e9ce58237..f82e86ef08 100644 --- a/indra/newview/llpanelplaceprofile.cpp +++ b/indra/newview/llpanelplaceprofile.cpp @@ -32,6 +32,7 @@ #include "llparcel.h" #include "message.h" +#include "llexpandabletextbox.h" #include "lliconctrl.h" #include "lllineeditor.h" #include "lltextbox.h" @@ -227,6 +228,34 @@ void LLPanelPlaceProfile::setInfoType(EInfoType type) getChild("advanced_info_accordion")->setVisible(is_info_type_agent); + // If we came from search we want larger description area, approx. 10 lines (see STORM-1311). + // Don't use the maximum available space because that leads to nasty artifacts + // in text editor and expandable text box. + { + const S32 SEARCH_DESC_HEIGHT = 150; + + // Remember original geometry (once). + static const S32 sOrigDescVPad = getChildView("parcel_title")->getRect().mBottom - mDescEditor->getRect().mTop; + static const S32 sOrigDescHeight = mDescEditor->getRect().getHeight(); + static const S32 sOrigMRIconVPad = mDescEditor->getRect().mBottom - mMaturityRatingIcon->getRect().mTop; + static const S32 sOrigMRTextVPad = mDescEditor->getRect().mBottom - mMaturityRatingText->getRect().mTop; + + // Resize the description. + const S32 desc_height = is_info_type_agent ? sOrigDescHeight : SEARCH_DESC_HEIGHT; + const S32 desc_top = getChildView("parcel_title")->getRect().mBottom - sOrigDescVPad; + LLRect desc_rect = mDescEditor->getRect(); + desc_rect.setOriginAndSize(desc_rect.mLeft, desc_top - desc_height, desc_rect.getWidth(), desc_height); + mDescEditor->reshape(desc_rect.getWidth(), desc_rect.getHeight()); + mDescEditor->setRect(desc_rect); + mDescEditor->updateTextShape(); + + // Move the maturity rating icon/text accordingly. + const S32 mr_icon_bottom = mDescEditor->getRect().mBottom - sOrigMRIconVPad - mMaturityRatingIcon->getRect().getHeight(); + const S32 mr_text_bottom = mDescEditor->getRect().mBottom - sOrigMRTextVPad - mMaturityRatingText->getRect().getHeight(); + mMaturityRatingIcon->setOrigin(mMaturityRatingIcon->getRect().mLeft, mr_icon_bottom); + mMaturityRatingText->setOrigin(mMaturityRatingText->getRect().mLeft, mr_text_bottom); + } + switch(type) { case AGENT: -- cgit v1.2.3 From c645e9e59e9e0a83a25f2c782ac79c21d519939e Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Mon, 25 Jul 2011 17:34:06 +0300 Subject: STORM-1220 FIXED Localized sim product name (e.g. "Estate / Full Region") everywhere. --- indra/newview/llpanelplaceprofile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelplaceprofile.cpp') diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp index 1e9ce58237..b3c2fe2552 100644 --- a/indra/newview/llpanelplaceprofile.cpp +++ b/indra/newview/llpanelplaceprofile.cpp @@ -434,7 +434,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel, } mRegionNameText->setText(region->getName()); - mRegionTypeText->setText(region->getSimProductName()); + mRegionTypeText->setText(region->getLocalizedSimProductName()); // Determine parcel owner if (parcel->isPublic()) -- cgit v1.2.3