diff options
5 files changed, 129 insertions, 64 deletions
diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp index 49f347dbda..96853545d7 100644 --- a/indra/newview/llpanelprofileclassifieds.cpp +++ b/indra/newview/llpanelprofileclassifieds.cpp @@ -468,6 +468,12 @@ BOOL LLPanelProfileClassified::postBuild() mSetLocationButton = getChild<LLButton>("set_to_curr_location_btn"); mCancelButton = getChild<LLButton>("cancel_btn"); + mTeleportBtnCnt = getChild<LLPanel>("teleport_btn_lp"); + mMapBtnCnt = getChild<LLPanel>("map_btn_lp"); + mEditBtnCnt = getChild<LLPanel>("edit_btn_lp"); + mCancelBtnCnt = getChild<LLPanel>("cancel_btn_lp"); + mSaveBtnCnt = getChild<LLPanel>("save_btn_lp"); + mSnapshotCtrl->setOnSelectCallback(boost::bind(&LLPanelProfileClassified::onTextureSelected, this)); mSnapshotCtrl->setMouseEnterCallback(boost::bind(&LLPanelProfileClassified::onTexturePickerMouseEnter, this)); mSnapshotCtrl->setMouseLeaveCallback(boost::bind(&LLPanelProfileClassified::onTexturePickerMouseLeave, this)); @@ -682,11 +688,12 @@ void LLPanelProfileClassified::setEditMode(BOOL edit_mode) void LLPanelProfileClassified::updateButtons() { - bool edit_mode = getEditMode(); - mMapButton->setVisible(!edit_mode); - mTeleportButton->setVisible(!edit_mode); - mSaveButton->setVisible(edit_mode); - mCancelButton->setVisible(edit_mode); + bool edit_mode = getEditMode(); + mTeleportBtnCnt->setVisible(!edit_mode); + mMapBtnCnt->setVisible(!edit_mode); + mEditBtnCnt->setVisible(!edit_mode); + mCancelBtnCnt->setVisible(edit_mode); + mSaveBtnCnt->setVisible(edit_mode); mEditButton->setVisible(!edit_mode && getSelfProfile()); } diff --git a/indra/newview/llpanelprofileclassifieds.h b/indra/newview/llpanelprofileclassifieds.h index 592007305b..3766858f42 100644 --- a/indra/newview/llpanelprofileclassifieds.h +++ b/indra/newview/llpanelprofileclassifieds.h @@ -327,6 +327,12 @@ private: LLButton* mSetLocationButton; LLButton* mCancelButton; + LLPanel* mMapBtnCnt; + LLPanel* mTeleportBtnCnt; + LLPanel* mEditBtnCnt; + LLPanel* mSaveBtnCnt; + LLPanel* mCancelBtnCnt; + LLScrollContainer* mScrollContainer; LLPanel* mInfoPanel; LLPanel* mEditPanel; diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index 3509eaa285..f8913d12c6 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -337,7 +337,7 @@ height="23" layout="bottomleft" left_pad="3" - name="show_on_map_btn_lp" + name="cancel_btn_lp" auto_resize="true" width="157"> <button diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml index 6d6036561b..bbbb4e0f4a 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml @@ -64,7 +64,7 @@ name="profile_scroll" top="0" left="0" - bottom="-45" + bottom="-35" width="320" follows="all" layout="topleft" @@ -647,65 +647,117 @@ </panel> </panel> </scroll_container> - <panel - name="button_panel" + <layout_stack + name="edit_btns_pnl" bottom="-1" left="9" - height="35" + height="25" follows="left|right|bottom" layout="topleft" + orientation="horizontal" + animate="false" > - <button - name="teleport_btn" - label="Teleport" - top="0" - left="0" - height="23" - width="101" - follows="bottom|left|right" - layout="topleft" - /> - <button - name="show_on_map_btn" - label="Map" - top="0" - left_pad="5" - height="23" - width="100" - follows="bottom|left|right" - layout="topleft" - /> - <button - name="edit_btn" - label="Edit" - top="0" - left_pad="5" - height="23" - width="101" - follows="bottom|left|right" - layout="topleft" - /> - <button - name="save_changes_btn" - label="[LABEL]" - top="0" - left="0" - height="23" - width="155" - follows="bottom|left|right" - layout="topleft" - visible="false" - /> - <button - name="cancel_btn" - label="Cancel" - top="0" - left_pad="5" - height="23" - width="156" - follows="bottom|left|right" - layout="topleft" - visible="false" - /> - </panel> + <layout_panel + follows="all" + height="25" + layout="topleft" + left="0" + name="teleport_btn_lp" + auto_resize="true" + top="0" + width="101"> + <button + name="teleport_btn" + label="Teleport" + top="0" + left="0" + height="23" + width="101" + follows="bottom|left|right" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + height="25" + layout="bottomleft" + left_pad="2" + name="map_btn_lp" + auto_resize="true" + width="100"> + <button + name="show_on_map_btn" + label="Map" + top="0" + left="0" + height="23" + width="100" + follows="bottom|left|right" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + height="25" + layout="bottomleft" + left_pad="2" + name="edit_btn_lp" + auto_resize="true" + width="101"> + <button + name="edit_btn" + label="Edit" + top="0" + left="0" + height="23" + width="101" + follows="bottom|left|right" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + height="25" + layout="topleft" + left="0" + name="save_btn_lp" + auto_resize="true" + top="0" + width="155"> + <button + name="save_changes_btn" + label="[LABEL]" + top="0" + left="0" + left_pad="5" + height="23" + width="155" + follows="bottom|left|right" + layout="topleft" + /> + </layout_panel> + + <layout_panel + follows="all" + height="25" + layout="bottomleft" + left_pad="2" + name="cancel_btn_lp" + auto_resize="true" + width="156"> + <button + name="cancel_btn" + label="Cancel" + top="0" + left="0" + height="23" + width="156" + follows="bottom|left|right" + layout="topleft" + /> + </layout_panel> + </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml index 91a1a183e0..fc6b92ed2f 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml @@ -49,7 +49,7 @@ <tab_container name="tab_classifieds" top="50" - bottom="-5" + bottom="-21" left="4" right="-4" follows="all" |