summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2010-02-25 18:47:28 +0200
committerSergei Litovchuk <slitovchuk@productengine.com>2010-02-25 18:47:28 +0200
commit087ea1cef62d383821e8e340551e757cb604b553 (patch)
treeb58945ffe384aad817e54a2db3c8ebc0b4e659bf /indra
parent4d978eaf0a5f09e4758956cf41f4dcf2bafb9b42 (diff)
Fixed normal bug (EXT-5748) Useless area on Place Profile panel.
- Reduced unused size in Place Profile and Landmark Info panels. --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelplaceinfo.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/panel_landmark_info.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_place_profile.xml4
3 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index 9ebc8ca2b9..f6133d4446 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -256,7 +256,7 @@ void LLPanelPlaceInfo::reshape(S32 width, S32 height, BOOL called_from_parent)
static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
S32 scroll_height = mScrollContainer->getRect().getHeight();
- if (mScrollingPanelMinHeight >= scroll_height)
+ if (mScrollingPanelMinHeight > scroll_height)
{
mScrollingPanel->reshape(mScrollingPanelWidth, mScrollingPanelMinHeight);
}
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 66070c028d..befeb182f9 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -89,13 +89,13 @@
<panel
bg_alpha_color="DkGray2"
follows="left|top|right"
- height="700"
+ height="630"
layout="topleft"
left="0"
min_height="300"
name="scrolling_panel"
top="0"
- width="285">
+ width="310">
<texture_picker
enabled="false"
follows="left|top|right"
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 b22dad5841..7672bd0799 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -174,13 +174,13 @@
<panel
bg_alpha_color="DkGray2"
follows="left|top|right"
- height="700"
+ height="532"
layout="topleft"
left="0"
min_height="300"
name="scrolling_panel"
top="0"
- width="285">
+ width="310">
<texture_picker
enabled="false"
follows="left|top|right"