diff options
| -rw-r--r-- | indra/newview/llfloatersocial.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/map_placeholder.jpg | bin | 0 -> 15526 bytes | |||
| -rwxr-xr-x | indra/newview/skins/default/textures/textures.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_social.xml | 103 |
4 files changed, 53 insertions, 59 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index cca966bb9a..361d54f696 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 Binary files differnew file mode 100644 index 0000000000..89f4eb88df --- /dev/null +++ b/indra/newview/skins/default/textures/icons/map_placeholder.jpg diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 64f7103ccc..731bbe8994 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 f99044b233..fc26ba5842 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> |
