From 5f851718505fdba77b1f7a6e47e4007e73747236 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Mon, 4 Jan 2010 13:58:42 -0800 Subject: EXT-3648 New message indicator on IM chiclets should be orange --- .../skins/default/textures/bottomtray/Unread_Chiclet.png | Bin 0 -> 250 bytes indra/newview/skins/default/textures/textures.xml | 3 ++- .../skins/default/xui/en/widgets/chiclet_im_adhoc.xml | 2 +- .../skins/default/xui/en/widgets/chiclet_im_group.xml | 2 +- .../skins/default/xui/en/widgets/chiclet_im_p2p.xml | 2 +- .../skins/default/xui/en/widgets/chiclet_offer.xml | 2 +- .../skins/default/xui/en/widgets/chiclet_script.xml | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png (limited to 'indra') diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png new file mode 100644 index 0000000000..447e0af0be Binary files /dev/null and b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 857936fbae..897a107c0f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -602,8 +602,9 @@ with the same filename but different name - + + diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml index 7cb973f4c8..af0d338256 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml @@ -33,7 +33,7 @@ Date: Mon, 4 Jan 2010 14:03:04 -0800 Subject: EXT-3721 SNAPSHOT PREVIEW can be dragged over the top menus --- indra/newview/skins/default/xui/en/main_view.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 65a545d2ed..ed06b91b18 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -121,6 +121,16 @@ tab_stop="false" top="0" width="1024"/> + - Date: Mon, 4 Jan 2010 14:04:20 -0800 Subject: EXT-2481 [BSI] Add "Zoom in" to 3D Object context menu and inspector Gear menu EXT-3388 [BSI] "Teleport" option missing dropdown when right clicking on friends list --- indra/newview/llviewermenu.cpp | 23 +++++++++++++++++++++- .../skins/default/xui/en/menu_avatar_other.xml | 6 ++++++ indra/newview/skins/default/xui/en/menu_object.xml | 6 ++++++ 3 files changed, 34 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 2a9c738c97..a28aef6ddd 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -3017,6 +3017,26 @@ bool callback_eject(const LLSD& notification, const LLSD& response) return false; } +void handle_avatar_teleport(const LLSD& avatar_id) +{ + // Use avatar_id if available, otherwise default to right-click avatar + LLVOAvatar* avatar = NULL; + if (avatar_id.asUUID().notNull()) + { + avatar = find_avatar_from_object(avatar_id.asUUID()); + } + else + { + avatar = find_avatar_from_object( + LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()); + } + + if( avatar ) + { + LLAvatarActions::offerTeleport(avatar->getID()); + } +} + void handle_avatar_eject(const LLSD& avatar_id) { // Use avatar_id if available, otherwise default to right-click avatar @@ -7913,6 +7933,7 @@ void initialize_menus() view_listener_t::addMenu(new LLAvatarInviteToGroup(), "Avatar.InviteToGroup"); view_listener_t::addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard"); commit.add("Avatar.Eject", boost::bind(&handle_avatar_eject, LLSD())); + commit.add("Avatar.Teleport", boost::bind(&handle_avatar_teleport, LLSD())); view_listener_t::addMenu(new LLAvatarSendIM(), "Avatar.SendIM"); view_listener_t::addMenu(new LLAvatarCall(), "Avatar.Call"); view_listener_t::addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse"); @@ -7952,8 +7973,8 @@ void initialize_menus() enable.add("Avatar.EnableMute", boost::bind(&enable_object_mute)); enable.add("Object.EnableMute", boost::bind(&enable_object_mute)); - enable.add("Object.EnableBuy", boost::bind(&enable_buy_object)); + commit.add("Object.ZoomIn", boost::bind(&handle_look_at_selection, "zoom")); // Attachment pie menu enable.add("Attachment.Label", boost::bind(&onEnableAttachmentLabel, _1, _2)); diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml index 0ad41546d2..78f057a7d7 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml @@ -93,4 +93,10 @@ + + + diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index 62500c5116..35518cd13b 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -57,6 +57,12 @@ + + + Date: Mon, 4 Jan 2010 14:36:04 -0800 Subject: moving this menu item to the right place EXT-3388 [BSI] "Teleport" option missing dropdown when right clicking on friends list --- indra/newview/llviewermenu.cpp | 21 --------------------- .../skins/default/xui/en/menu_avatar_other.xml | 6 ------ .../skins/default/xui/en/menu_people_nearby.xml | 6 ++++++ 3 files changed, 6 insertions(+), 27 deletions(-) (limited to 'indra') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index a28aef6ddd..b56af3c345 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -3017,26 +3017,6 @@ bool callback_eject(const LLSD& notification, const LLSD& response) return false; } -void handle_avatar_teleport(const LLSD& avatar_id) -{ - // Use avatar_id if available, otherwise default to right-click avatar - LLVOAvatar* avatar = NULL; - if (avatar_id.asUUID().notNull()) - { - avatar = find_avatar_from_object(avatar_id.asUUID()); - } - else - { - avatar = find_avatar_from_object( - LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()); - } - - if( avatar ) - { - LLAvatarActions::offerTeleport(avatar->getID()); - } -} - void handle_avatar_eject(const LLSD& avatar_id) { // Use avatar_id if available, otherwise default to right-click avatar @@ -7933,7 +7913,6 @@ void initialize_menus() view_listener_t::addMenu(new LLAvatarInviteToGroup(), "Avatar.InviteToGroup"); view_listener_t::addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard"); commit.add("Avatar.Eject", boost::bind(&handle_avatar_eject, LLSD())); - commit.add("Avatar.Teleport", boost::bind(&handle_avatar_teleport, LLSD())); view_listener_t::addMenu(new LLAvatarSendIM(), "Avatar.SendIM"); view_listener_t::addMenu(new LLAvatarCall(), "Avatar.Call"); view_listener_t::addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse"); diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml index 78f057a7d7..0ad41546d2 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml @@ -93,10 +93,4 @@ - - - diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index 5f2e6e0f6c..c4da1df017 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -63,4 +63,10 @@ function="Avatar.EnableItem" parameter="can_block" /> + + + -- cgit v1.2.3 From 6064d8a22645596f0bf5e944200f314f0c03e8d8 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Mon, 4 Jan 2010 15:02:24 -0800 Subject: Backed out changeset: 9edc40cf0ac6 --- indra/newview/skins/default/xui/en/main_view.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index ed06b91b18..65a545d2ed 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -121,16 +121,6 @@ tab_stop="false" top="0" width="1024"/> - +