diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelprofile.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelprofile.h | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 150 |
3 files changed, 93 insertions, 60 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index d40f874f24..6c0b1b9047 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -270,6 +270,7 @@ BOOL LLPanelProfileSecondLife::postBuild() mPayButton = getChild<LLButton>("pay"); mIMButton = getChild<LLButton>("im"); mCopyMenuButton = getChild<LLMenuButton>("copy_btn"); + mGiveInvPanel = getChild<LLPanel>("give_stack"); mStatusText->setVisible(FALSE); mCopyMenuButton->setVisible(FALSE); @@ -321,6 +322,7 @@ void LLPanelProfileSecondLife::onOpen(const LLSD& key) mBlockButton->setVisible(!own_profile); mUnblockButton->setVisible(!own_profile); mGroupList->setShowNone(!own_profile); + mGiveInvPanel->setVisible(!own_profile); if (own_profile && !getEmbedded()) { diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h index ba98a360fa..7d22b64dbe 100644 --- a/indra/newview/llpanelprofile.h +++ b/indra/newview/llpanelprofile.h @@ -203,6 +203,7 @@ private: LLButton* mPayButton; LLButton* mIMButton; LLMenuButton* mCopyMenuButton; + LLPanel* mGiveInvPanel; bool mVoiceStatus; diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml index a5f486d4a1..f7d3353786 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -322,76 +322,106 @@ name="group_list" top_delta="-20" left="66" - right="-6" - height="80" + right="-7" + height="82" follows="left|top|right" layout="topleft" border_visible="true" color="ScrollBgWriteableColor" for_agent="false" /> - <text - name="About:" - value="About:" - top_pad="8" - left="6" - height="16" - width="55" - follows="left|top" - layout="topleft" - halign="right" - /> - <text_editor - name="sl_description_edit" - enabled="false" - top_delta="0" - left="66" - right="-7" - height="100" - follows="all" - layout="topleft" - bg_readonly_color="Transparent" - border_visible="true" - font="SansSerifSmall" - h_pad="2" - max_length="510" - parse_urls="true" - word_wrap="true" - /> - <text - name="Give item:" - value="Give item:" - top_pad="10" + + <layout_stack + name="aboutpositioner" + top_pad="7" left="6" - height="16" - width="55" - follows="left|bottom" - layout="topleft" - halign="right" - /> - <view_border - name="drop_target_rect_vis" - top_delta="0" - left="66" right="-6" - height="16" - follows="left|bottom|right" - layout="topleft" - bevel_style="in" - /> - <text - name="Give inventory" - tool_tip="Drop inventory items here to give them to this person." - top_delta="0" - left="66" - right="-6" - height="16" - follows="left|bottom|right" + height="130" + follows="all" layout="topleft" - halign="center" + orientation="vertical" > - Drop inventory item here. - </text> + <layout_panel + name="about_stack" + follows="all" + layout="topleft" + left="0" + height="105" + auto_resize="true" + user_resize="false"> + <text + name="About:" + value="About:" + top="1" + left="0" + height="16" + width="55" + follows="left|top" + layout="topleft" + halign="right" + /> + <text_editor + name="sl_description_edit" + enabled="false" + top="0" + left="60" + right="-1" + bottom="-1" + follows="all" + layout="topleft" + bg_readonly_color="Transparent" + border_visible="true" + font="SansSerifSmall" + h_pad="2" + max_length="510" + parse_urls="true" + word_wrap="true" + /> + </layout_panel> + <layout_panel + name="give_stack" + follows="left|bottom" + layout="topleft" + left="0" + height="24" + auto_resize="false" + user_resize="false"> + <text + name="Give item:" + value="Give item:" + top="6" + left="0" + height="16" + width="55" + follows="left|bottom" + layout="topleft" + halign="right" + /> + <view_border + name="drop_target_rect_vis" + top_delta="0" + left="60" + right="-1" + height="16" + follows="left|bottom|right" + layout="topleft" + bevel_style="in" + /> + <text + name="Give inventory" + tool_tip="Drop inventory items here to give them to this person." + top_delta="0" + left="60" + right="-1" + height="16" + follows="left|bottom|right" + layout="topleft" + halign="center" + > + Drop inventory item here. + </text> + </layout_panel> + </layout_stack> <layout_stack name="buttonstack" bottom="-3" |