From 637bcedf029bfbe4d31668834476bf972a97dd60 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Thu, 7 Oct 2010 17:12:49 +0300 Subject: FIXED STORM-302 Parcel lists scroll bar overlaps with other components if panel is undocked - Added missing column to the xml of the scroll list - Adjusted columns width to show all columns --- .../newview/skins/default/xui/en/panel_group_land_money.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 76f7484c68..64539f2134 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -65,19 +65,23 @@ + width="47" /> + width="47" /> + width="47" /> + width="47" /> + Date: Thu, 7 Oct 2010 18:54:30 +0300 Subject: STORM-296 FIXED Item types that can be dropped to Places SP->My Landmarks restricted to landmarks and folders only. --- indra/newview/llplacesinventorypanel.cpp | 18 ++++++++++++++++++ indra/newview/llplacesinventorypanel.h | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp index 29e262199e..408270a1a0 100644 --- a/indra/newview/llplacesinventorypanel.cpp +++ b/indra/newview/llplacesinventorypanel.cpp @@ -205,6 +205,24 @@ BOOL LLPlacesFolderView::handleRightMouseDown(S32 x, S32 y, MASK mask) return LLFolderView::handleRightMouseDown(x, y, mask); } +BOOL LLPlacesFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, + EDragAndDropType cargo_type, + void* cargo_data, + EAcceptance* accept, + std::string& tooltip_msg) +{ + // Don't accept anything except landmarks and folders to be dropped + // in places folder view. See STORM-296. + if (cargo_type != DAD_LANDMARK && cargo_type != DAD_CATEGORY) + { + *accept = ACCEPT_NO; + return FALSE; + } + + return LLFolderView::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, + accept, tooltip_msg); +} + void LLPlacesFolderView::setupMenuHandle(LLInventoryType::EType asset_type, LLHandle menu_handle) { mMenuHandlesByInventoryType[asset_type] = menu_handle; diff --git a/indra/newview/llplacesinventorypanel.h b/indra/newview/llplacesinventorypanel.h index 6641871a0b..a44776d18b 100644 --- a/indra/newview/llplacesinventorypanel.h +++ b/indra/newview/llplacesinventorypanel.h @@ -70,6 +70,12 @@ public: */ /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask ); + /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, + EDragAndDropType cargo_type, + void* cargo_data, + EAcceptance* accept, + std::string& tooltip_msg); + void setupMenuHandle(LLInventoryType::EType asset_type, LLHandle menu_handle); void setParentLandmarksPanel(LLLandmarksPanel* panel) -- cgit v1.2.3 From f6a9174463ecb93f537752b7194eb0400a13758b Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Thu, 7 Oct 2010 16:37:06 -0700 Subject: CT-575 WIP ES translation for Set18 --- indra/newview/skins/default/xui/es/floater_map.xml | 25 +------ .../skins/default/xui/es/floater_nearby_chat.xml | 4 +- .../newview/skins/default/xui/es/floater_tools.xml | 7 +- .../skins/default/xui/es/menu_attachment_self.xml | 1 + .../skins/default/xui/es/menu_avatar_self.xml | 3 +- .../default/xui/es/menu_inspect_object_gear.xml | 1 + .../default/xui/es/menu_inspect_self_gear.xml | 1 + .../newview/skins/default/xui/es/menu_mini_map.xml | 1 + indra/newview/skins/default/xui/es/menu_object.xml | 8 +- .../xui/es/menu_people_friends_view_sort.xml | 1 + .../xui/es/menu_people_nearby_multiselect.xml | 1 + indra/newview/skins/default/xui/es/menu_viewer.xml | 16 ++-- .../default/xui/es/menu_wearable_list_item.xml | 2 +- .../skins/default/xui/es/menu_wearing_gear.xml | 1 + .../skins/default/xui/es/menu_wearing_tab.xml | 2 + .../newview/skins/default/xui/es/notifications.xml | 12 ++- .../default/xui/es/panel_avatar_list_item.xml | 4 + .../skins/default/xui/es/panel_bottomtray.xml | 18 ++--- .../skins/default/xui/es/panel_classified_info.xml | 14 +++- .../skins/default/xui/es/panel_edit_classified.xml | 12 ++- .../skins/default/xui/es/panel_edit_pick.xml | 10 ++- .../skins/default/xui/es/panel_edit_profile.xml | 10 ++- .../skins/default/xui/es/panel_edit_wearable.xml | 10 ++- .../default/xui/es/panel_group_info_sidetray.xml | 10 ++- .../skins/default/xui/es/panel_landmarks.xml | 14 +++- .../skins/default/xui/es/panel_my_profile.xml | 7 +- indra/newview/skins/default/xui/es/panel_notes.xml | 30 +++++--- .../skins/default/xui/es/panel_outfit_edit.xml | 10 ++- .../default/xui/es/panel_outfits_inventory.xml | 10 ++- .../newview/skins/default/xui/es/panel_people.xml | 50 ++++++++++--- .../skins/default/xui/es/panel_pick_info.xml | 20 +++-- indra/newview/skins/default/xui/es/panel_picks.xml | 23 ++++-- .../newview/skins/default/xui/es/panel_places.xml | 48 ++++++++++-- .../default/xui/es/panel_preferences_chat.xml | 38 +++++----- .../default/xui/es/panel_preferences_general.xml | 2 +- .../default/xui/es/panel_preferences_graphics1.xml | 36 ++++----- .../newview/skins/default/xui/es/panel_profile.xml | 26 +++++-- .../default/xui/es/panel_side_tray_tab_caption.xml | 2 + .../skins/default/xui/es/sidepanel_inventory.xml | 20 +++-- .../skins/default/xui/es/sidepanel_item_info.xml | 85 +++++++++++----------- indra/newview/skins/default/xui/es/strings.xml | 36 ++++++--- 41 files changed, 408 insertions(+), 223 deletions(-) diff --git a/indra/newview/skins/default/xui/es/floater_map.xml b/indra/newview/skins/default/xui/es/floater_map.xml index 73e947f1f7..fa01a4a635 100644 --- a/indra/newview/skins/default/xui/es/floater_map.xml +++ b/indra/newview/skins/default/xui/es/floater_map.xml @@ -1,28 +1,7 @@ - - N - - - E - - - O - - - S - - - SE - - - NE - - - SO - - - NO + + [REGIÓN](Haz doble clic para abrir el mapa y pulsa la tecla Mayús y arrastra para obtener una vista panorámica) MINIMAPA diff --git a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml b/indra/newview/skins/default/xui/es/floater_nearby_chat.xml index d30a39f725..1fee9ab056 100644 --- a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/es/floater_nearby_chat.xml @@ -1,2 +1,4 @@ - + + + diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml index bc99cfe215..9867f1b575 100644 --- a/indra/newview/skins/default/xui/es/floater_tools.xml +++ b/indra/newview/skins/default/xui/es/floater_tools.xml @@ -182,10 +182,10 @@ Grupo: -