From 57234d2744cd55a513a885a0b5e78e0b33ceebbf Mon Sep 17 00:00:00 2001 From: Ychebotarev ProductEngine Date: Wed, 3 Feb 2010 16:42:06 +0200 Subject: fix CRASH in roles tab in group info panel. no ticket... --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_group_roles.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index f19057cae3..25a0213bde 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -493,6 +493,10 @@ things in this group. There's a broad variety of Abilities. tool_tip="For details of each allowed ability see the abilities tab" top_pad="0" width="300"> + Date: Wed, 3 Feb 2010 16:48:15 +0200 Subject: Fixed normal bug EXT-4796 (Linux only: Call Group button blinks while Group Chat). - Removed updateCallButton() call from draw() and added it to LLIMFloater::sessionInitReplyReceived() to enable "Call" button when session is initialized. --HG-- branch : product-engine --- indra/newview/llimfloater.cpp | 6 ++++++ indra/newview/llpanelimcontrolpanel.cpp | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 36f7304074..1eac90371d 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -572,6 +572,12 @@ void LLIMFloater::sessionInitReplyReceived(const LLUUID& im_session_id) setKey(im_session_id); mControlPanel->setSessionId(im_session_id); } + + // updating "Call" button from group control panel here to enable it without placing into draw() (EXT-4796) + if(gAgent.isInGroup(im_session_id)) + { + mControlPanel->updateCallButton(); + } //*TODO here we should remove "starting session..." warning message if we added it in postBuild() (IB) diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index ff1e43b526..d491583b56 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -280,8 +280,6 @@ void LLPanelGroupControlPanel::draw() // Need to resort the participant list if it's in sort by recent speaker order. if (mParticipantList) mParticipantList->updateRecentSpeakersOrder(); - //* TODO: find better way to properly enable call button for group and remove this call from draw() - updateCallButton(); LLPanelChatControlPanel::draw(); } -- cgit v1.2.3 From 5ec6cc4fe1ff4c042b31285e62683eb3f4e9c73d Mon Sep 17 00:00:00 2001 From: Denis Serdjuk Date: Wed, 3 Feb 2010 16:52:29 +0200 Subject: fixed critical Bug EXT-4831 [NUX] Parcel property icons are off by default Default value of 'NavBarShowParcelProperties' has been changed --HG-- branch : product-engine --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 62197406b6..793d7b6207 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7802,7 +7802,7 @@ Type Boolean Value - 1 + 0 ShowCrosshairs -- cgit v1.2.3 From 906ee0cc6348fc3cce70f971f3009924550c24be Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 3 Feb 2010 16:57:24 +0200 Subject: fix for reopened EXT-4578 Noninteractive voice notifications should have close affordance --HG-- branch : product-engine --- indra/newview/llimview.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 9a3a4c0125..0c64c2b032 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1709,6 +1709,8 @@ BOOL LLOutgoingCallDialog::postBuild() childSetAction("Cancel", onCancel, this); + setCanDrag(FALSE); + return success; } @@ -1808,6 +1810,8 @@ BOOL LLIncomingCallDialog::postBuild() mLifetimeTimer.stop(); } + setCanDrag(FALSE); + return TRUE; } -- cgit v1.2.3 From cabf4f5d58410e9c1fb8c06b0f40900119d37fa7 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 3 Feb 2010 17:06:57 +0200 Subject: Fixed critical bug EXT-4836 ([NUX] Add text to empty Friends tab in People Panel) - added an appropriate message into My Friends tab when avatar has no friends. - "global search" & "try the Map" are made as url to appropriate floaters --HG-- branch : product-engine --- indra/newview/llpanelpeople.cpp | 5 +++++ indra/newview/skins/default/xui/en/panel_people.xml | 11 +++++++++++ 2 files changed, 16 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index fb6f36d4da..423ee61e25 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -667,6 +667,11 @@ void LLPanelPeople::updateFriendList() lldebugs << "Friends Cards were not found" << llendl; } + // show special help text for just created account to help found friends. EXT-4836 + static LLTextBox* no_friends_text = getChild("no_friends_msg"); + no_friends_text->setVisible(all_friendsp.size() == 0); + + LLAvatarTracker::buddy_map_t::const_iterator buddy_it = all_buddies.begin(); for (; buddy_it != all_buddies.end(); ++buddy_it) { diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 9b83e0c68e..3b5add33a8 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -160,6 +160,17 @@ background_visible="true" width="313" /> + + To add friends try [secondlife:///app/search/people global search] or click on a user to add them as a friend. +If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map]. + Date: Wed, 3 Feb 2010 17:14:04 +0200 Subject: merge --HG-- branch : product-engine --- indra/newview/llgroupmgr.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 8bd0e520c3..72a52ba13b 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -1714,6 +1714,8 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id, for (std::vector::iterator it = member_ids.begin(); it != member_ids.end(); ++it) { + LLUUID& ejected_member_id = (*it); + // Can't use 'eject' to leave a group. if ((*it) == gAgent.getID()) continue; @@ -1734,7 +1736,7 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id, } msg->nextBlock("EjectData"); - msg->addUUID("EjecteeID",(*it)); + msg->addUUID("EjecteeID",ejected_member_id); if (msg->isSendFull()) { @@ -1746,13 +1748,15 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id, for (LLGroupMemberData::role_list_t::iterator rit = (*mit).second->roleBegin(); rit != (*mit).second->roleEnd(); ++rit) { - if ((*rit).first.notNull()) + if ((*rit).first.notNull() && (*rit).second!=0) { - (*rit).second->removeMember(*it); + (*rit).second->removeMember(ejected_member_id); } } - delete (*mit).second; + group_datap->mMembers.erase(*it); + + delete (*mit).second; } } -- cgit v1.2.3 From 005ec1479021e698714dcdc4bab189af6fcf5ff4 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 3 Feb 2010 17:18:59 +0200 Subject: implemented EXT-4889 Please add Pay button to IM window --HG-- branch : product-engine --- .../skins/default/xui/en/panel_im_control_panel.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 9279d1e686..3fd75d5755 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -112,6 +112,23 @@ name="share_btn" width="100" /> + +