From 9c5d1fd3bd9f9cfb20341b9fb7b1046784206432 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
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 +-------
indra/newview/llpanelplaceinfo.h | 1 -
indra/newview/skins/default/xui/en/panel_place_profile.xml | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)
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<LLIconCtrl>("maturity_icon");
mMaturityRatingText = getChild<LLTextBox>("maturity_value");
- LLScrollContainer* scroll_container = getChild<LLScrollContainer>("place_scroll");
- scroll_container->setBorderVisible(FALSE);
- mMinHeight = scroll_container->getScrolledViewRect().getHeight();
-
return TRUE;
}
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index ba32cc4c34..133933a880 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -110,7 +110,6 @@ protected:
LLUUID mRequestedID;
LLVector3 mPosRegion;
std::string mCurrentTitle;
- S32 mMinHeight;
INFO_TYPE mInfoType;
LLTextBox* mTitle;
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index d3eb548207..b5ae05fe6c 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -172,7 +172,7 @@
width="313">
<panel
bg_alpha_color="DkGray2"
- follows="top|left|right"
+ follows="all"
height="533"
layout="topleft"
left="0"
--
cgit v1.2.3