From 37fcb81c4ab8806a52ef747e6a3047fff2d6eccf Mon Sep 17 00:00:00 2001 From: Merov Linden <merov@lindenlab.com> Date: Mon, 24 Jun 2013 13:32:13 -0700 Subject: [PATCH] ACME-497 : Clean up the xml code for checkin to use a proper icon widget and add a decent default image for it --- indra/newview/llfloatersocial.cpp | 7 +- .../textures/icons/map_placeholder.jpg | Bin 0 -> 15526 bytes .../skins/default/textures/textures.xml | 2 + .../skins/default/xui/en/floater_social.xml | 103 ++++++++---------- 4 files changed, 53 insertions(+), 59 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/map_placeholder.jpg diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index cca966bb9ab..361d54f6964 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -42,7 +42,11 @@ static LLRegisterPanelClassWrapper<LLSocialCheckinPanel> t_panel_checkin("llsoci std::string get_map_url() { - LLVector3d center_agent = gAgent.getRegion()->getCenterGlobal(); + LLVector3d center_agent; + if (gAgent.getRegion()) + { + center_agent = gAgent.getRegion()->getCenterGlobal(); + } int x_pos = center_agent[0] / 256.0; int y_pos = center_agent[1] / 256.0; std::string map_url = gSavedSettings.getString("CurrentMapServerURL") + llformat("map-1-%d-%d-objects.jpg", x_pos, y_pos); @@ -104,7 +108,6 @@ void LLSocialCheckinPanel::onSend() std::string description; LLAgentUI::buildLocationString(description, LLAgentUI::LOCATION_FORMAT_NORMAL_COORDS, gAgent.getPositionAgent()); - // Optionally add the region map view bool add_map_view = getChild<LLUICtrl>("add_place_view_cb")->getValue().asBoolean(); std::string map_url = (add_map_view ? mMapUrl : ""); diff --git a/indra/newview/skins/default/textures/icons/map_placeholder.jpg b/indra/newview/skins/default/textures/icons/map_placeholder.jpg new file mode 100644 index 0000000000000000000000000000000000000000..89f4eb88dfa3f1098f8dc5cf678261c4f4e64df4 GIT binary patch literal 15526 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 C=h=$@ literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 64f7103ccc5..731bbe8994f 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -325,6 +325,8 @@ with the same filename but different name <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" /> + <texture name="Map_Placeholder_Icon" file_name="icons/map_placeholder.jpg" preload="true" /> + <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" /> <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" /> diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml index f99044b2337..fc26ba58425 100644 --- a/indra/newview/skins/default/xui/en/floater_social.xml +++ b/indra/newview/skins/default/xui/en/floater_social.xml @@ -379,36 +379,25 @@ <layout_panel name="place_map_panel" height="133"> - <ui_ctrl - height="128" - width="128" - name="map_placeholder" - top_pad="5" - follows="left|top" - left="9"> - <panel - background_visible="true" - border_image="Badge_Border" - border_color="BadgeBorderColor" - bg_alpha_color="0.9 1 0.9 1" - follows="left|top" - halign="center" - height="128" - width="128" - left="0" - top="0" - name="map_panel" - visible="true"/> - </ui_ctrl> - <check_box - follows="left|top" - initial_value="true" - top_delta="8" - width="8" - label="" - name="add_place_view_cb" - left_pad="5"/> - <text + <icon + follows="left|top" + height="128" + width="128" + image_name="Map_Placeholder_Icon" + layout="topleft" + top="5" + left="9" + name="map_placeholder"> + </icon> + <check_box + follows="left|top" + initial_value="true" + top_delta="8" + width="8" + label="" + name="add_place_view_cb" + left_pad="5"/> + <text follows="left|top" font="SansSerif" height="32" @@ -418,35 +407,35 @@ top_delta="-8" type="string"> Include overhead view of location - </text> - </layout_panel> - <layout_panel - name="place_button_panel" - height="96"> - <button - follows="left|top" - top="5" - left="9" - height="23" - label="Post" - name="post_place_btn" - width="100"> - <button.commit_callback + </text> + </layout_panel> + <layout_panel + name="place_button_panel" + height="96"> + <button + follows="left|top" + top="5" + left="9" + height="23" + label="Post" + name="post_place_btn" + width="100"> + <button.commit_callback function="SocialSharing.SendCheckin" /> - </button> - <button - follows="left|top" - height="23" - label="Cancel" - name="cancel_btn" - left_pad="15" - top_delta="0" - width="100"> - <button.commit_callback + </button> + <button + follows="left|top" + height="23" + label="Cancel" + name="cancel_btn" + left_pad="15" + top_delta="0" + width="100"> + <button.commit_callback function="SocialSharing.Cancel" /> - </button> - </layout_panel> - </layout_stack> + </button> + </layout_panel> + </layout_stack> </panel> </tab_container> </floater> -- GitLab