Commit Graph

69 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Alexei Arabadji 129da72326 EXT-6710 FIXED Corrected 'ItemsShared' notification message and provided logging of 'item shared' message instead of spawning IM session and add message to it.
Details:
1 Corrected 'ItemsShared' notification message.
2 Avoided spawning session on item shared event.
3 Provided logging of item shared message.
4 Provided logging of 'IMSystemMessageTip' notification without opened related IM session.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/612/

--HG--
branch : product-engine
2010-06-18 17:52:54 +03:00
Alexei Arabadji a3a037ea7d EXT-6710 FIXED Updated inventory items sharing behavior according to comments: "Andrey ProductEngine added a comment - 02/Jun/10 03:21 AM" and "Grumpity ProductEngine added a comment - 02/Jun/10 03:25 AM" of EXT-6710 issue.
1 Reused 'ShareNotification' with updated message.
2 Made allert message box scrollable(done by Yuri Chebotarev).
3 Updated word words_separator in strings.xml.
4 Made friends list tab of avatar picker be opened on 'share with avatar' action.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/525/

--HG--
branch : product-engine
2010-06-09 15:39:11 +03:00
Alexei Arabadji b41aa1e0b2 EXT-6710 FIXED Added inventory items sharing confirmation and modified alert about non-copy objects sharing.
Current behavior:
* user will be prompted about sharing items regardless is it one or more items;
* user will be prompted about trying to share one ore more non-copy items;
* in case user tries to share non-copy items among with copy items — copy  tems will be shared and user will be prompted about sharing non-copy items

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/475/

--HG--
branch : product-engine
2010-06-01 14:13:56 +03:00
Mike Antipov 7439332656 EXT-6710 FIXED Implemented functionality to give multiselected inventory items to several selected avatars in avatar picker:
1. Select items to share
2. Click Share; Resident chooser opens
3. Select residents to share with, click SELECT
4. Selected items are transferred to selected users
5. Pop-up toast confirms transfer

Some implementation notes:
 * Avatar Picker is not closed when give inventory requests are sent (to be enable change selection and offer other items to other avatars)
 * Select button is enableв if all selected items can be offered.
 * Disabling of the "Share" menu item in the Inventory context menu is syncronized with check (before sending offer) whether item can be offered at all

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/

--HG--
branch : product-engine
2010-05-21 13:16:41 +03:00
Roxie Linden 8d8f167a4e automated merge with trunk 2010-04-19 16:24:05 -07:00
Eugene Mutavchi 27b457f2ce Implemented major task EXT-6710(Feature request: Allow drag and drop from Inventory panel to Resident Picker)
- added handling the drag add drop inventory items to resident picker
 - added "Share" verb button to the inventory panel which opens resident picker
 - added "Share" menu item to the individual inventory context menu which acts as verb button
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/215/

--HG--
branch : product-engine
2010-04-12 17:02:16 +03:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden 9523c70f9d DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser).  Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)

Also, refactor of voice to modularize it, and add a diamondware voice module.
CR:  Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-02 02:03:21 -07:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Vadim Savchuk 3e23c04c9b Merge from default branch
--HG--
branch : product-engine
2010-03-30 18:19:56 +03:00
Loren Shih 114e5ca083 EXT-5940 : Typedef all vector<LLUUID>'s
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
Paul Guslisty d5d9668a59 Fixed low bug EXT-6488 (Teleport menuitem is enabled for offline residents in the context menu and inspectors)
- Added a check for a teleport offer ability. In XML created a paremeter and check it in source code.

Reviewed by Leyla Farazha at https://codereview.productengine.com/secondlife/r/86/

--HG--
branch : product-engine
2010-03-25 09:04:01 +02:00
Igor Borovkov 858d1e9ad0 fixed EXT-6476 (waiting).txt chat log file with "(waiting)" instead of avatar name gets created when Offering Teleport from Search Floater
offer teleport action is put on hold until Name Cache gets updated with appropriate avatar name

--HG--
branch : product-engine
2010-03-22 17:02:44 +02:00
Sergei Litovchuk f8299e28b9 Fixed low bug (EXT-5136) Add the "Map" item to the people context menu.
--HG--
branch : product-engine
2010-02-22 23:20:34 +02:00
Igor Borovkov 3d8caa79a7 fixed waiting bug for EXT-4976 IM Window with 'Show End of Last Conversation' turned on, doesnt show Avatar name, or correct information
--HG--
branch : product-engine
2010-02-10 13:04:18 +02:00
Vadim Savchuk e5bd3b8a48 Fixed bug EXT-2915 ([BSI] Pay Button is hard to find on small resolutions).
Added a "Block/Unblock" item to the profile view panel overflow menu to make the menu more visible.

--HG--
branch : product-engine
2010-02-03 22:42:10 +02:00
Andrew Dyukov a908a528fe No ticket. Fixed a bit(added check for canCall()) isCalling() method from LLAvataActions, but it appears that it is not used anywhere. So i commented it out. Maybe it should be removed?
--HG--
branch : product-engine
2010-01-25 22:19:03 +02:00
Andrew Dyukov ab0c9c6754 Fixed normal bugs EXT-4450 ([BSI] call buttons enabled when voice is disabled) and EXT-4313
(Should not be able to start a call when voice is disabled). Call buttons state now reacts on
voice changes in time.

- Added voiceWorking() method to LLVoiceClient to determine real availability of voice, because voiceEnabled()
doesn't take into account possible errors. Perhaps there is no need in two methods- some investigation will be
made and depending on its results they may become one non-static method. voiceWorking() uses state of voice
client(mState) to determine voice availability. Also some states which are not currently counted by voiceWorking()
as valid may be added if testing reveals problems.

- To enable/disable call buttons in time, LLVoiceClientStatusObserver is used. Its trigger uses states from its
enum only to skip updating button in some states(to avoid button blinking), but to determine button state
LLVoiceClient's voiceWorking() is used.

--HG--
branch : product-engine
2010-01-22 22:16:57 +02:00
Vadim Savchuk 727d3c8f08 Teleport offers should be recorded to IM history only after they were sent (EXT-4315).
--HG--
branch : product-engine
2010-01-14 21:29:53 +02:00
Vadim Savchuk f9a2b8f9de Minor spelling issue.
--HG--
branch : product-engine
2010-01-05 20:22:50 +02:00
Vadim Savchuk 62014dd423 Fixed bug EXT-3791 (No feedback provided when offering teleport): the offer is now logged to the IM history.
--HG--
branch : product-engine
2010-01-05 20:20:09 +02:00
Alexei Arabadji ed7bf18788 fixed EXT-3942 “'Friendship offered' notification not shows in opened IM floater”,
added missing avatar id to the notification payload;

--HG--
branch : product-engine
2010-01-05 14:34:38 +02:00
Igor Borovkov 191e5f9ca0 merge
--HG--
branch : product-engine
2009-12-22 17:49:35 +02:00
Igor Borovkov 304e321f89 implemented EXT-3515 Click on IM button for multiple selected Avatars each time creates new IM session
--HG--
branch : product-engine
2009-12-22 16:39:56 +02:00
Leyla Farazha 470dba630b merge 2009-12-21 16:18:28 -08:00
Leyla Farazha 9538f96613 EXT-3523 Missing God Mode functions in User Profile
EXT-2635 	 No message reminding user that a restart is required to reset cache (was Clear Cache)
reviewed by Richard
2009-12-21 15:33:06 -08:00
Mike Antipov a332ec1608 Fixed major bug EXT-3467 (Call button/menuitem is disabled for offline avatars)
-- implemented verifying only of Voice Client state to enable/disable Call button

--HG--
branch : product-engine
2009-12-17 17:03:48 +02:00
Igor Borovkov 9dd2b29031 fixed EXT-2884 Initiation of a voice call should not bring text chat (p2p, ad-hoc, group)
Added flag to an LLIMSession which indicated whether it has been created for a voice call.

--HG--
branch : product-engine
2009-12-16 15:30:33 +02:00
Paul Guslisty fe0da9bf7b Fixed low bug EXT - 3255 (Call button is enabled in the People & Profile panels while voice is disabled)
--HG--
branch : product-engine
2009-12-14 19:53:54 +02:00
Lynx Linden 9b4d09471c DEV-41317 DEV-42311: Improved auto-call implementation.
Improved the implementation for auto-connecting an adhoc call. This
involved having the controller (LLIMMgr) set a flag in the model
(LLIMModel) to autoconnect on initialize. Now all of the view code
(LLPanelChatControlPanel) and the signal/callback infrastructure that
I added earlier can be removed as it violated MVP separation. Ah!
Much nicer. Thanks to PE folk for the suggestion.
2009-12-10 14:05:17 +00:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00
Roxie Linden 5352954eb6 automated merge 2010-02-26 17:34:39 -08:00
Roxie Linden 9b05fecbf6 automated merge from trunk 2010-02-25 18:24:07 -08:00
Roxie Linden 0ac14158bc automated merge from trunk 2010-02-25 14:12:18 -08:00
Roxie Linden c6163fafaa automated merge 2010-02-25 01:34:52 -08:00
Alexei Arabadji 0a617f15a8 implemented EXT-2797 “Making friendship offer should be recorded into IM history”
--HG--
branch : product-engine
2009-12-07 15:15:41 +02:00
James Cook 957055396d merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp 2009-11-25 12:31:24 -08:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
Loren Shih ccf6cb3f9b viewer-2.0 automated merge
--HG--
branch : avatar-pipeline
2009-11-24 22:11:24 -05:00
Vadim Savchuk b619f822e6 merge
--HG--
branch : product-engine
2009-11-24 21:55:23 +02:00
Loren Shih a22bb00530 merge
--HG--
branch : avatar-pipeline
2009-11-24 12:10:10 -05:00
Nyx (Neal Orman) 24dbd81763 EXT-829 share button in profile inactive
refactored share code to all call LLAvatarActions::share.
Function opens an IM window if one doesn't already exist and prints an
appropriate message, as well as opening the inventory sidepanel.

Verified working in IM window, people tab, and individual's profile.

Will be post-reviewed before push.

--HG--
branch : avatar-pipeline
2009-11-23 13:23:54 -05:00
Andrew Dyukov 35ebf50ec7 Fixed normal bug EXT-2668 (NONE group is present in the Group Chooser for which to send invitation).
--HG--
branch : product-engine
2009-11-23 19:08:52 +02:00
Nyx (Neal Orman) 52c27b99b8 EXT-829 share button in people panel is inactive
First pass at getting share buttons in the three places we need them:
person's profile
IM window
people panel

Only UI changes so far, functionality in a future checkin.

Will be reviewed before pushing.

--HG--
branch : avatar-pipeline
2009-11-20 17:52:17 -05:00
Vadim Savchuk 70a0dbe8f8 Renamed classes and files for "Me" task panel for better readability.
Renamed files:
- indra/newview/llpanelmeprofile.{cpp,h} to llpanelme.{cpp,h}
- panel_me_profile.xml to panel_me.xml
- panel_profile_user.xml to panel_my_profile.xml

Renamed classes:
- LLPanelAvatarMeProfile to LLPanelMyProfile
- LLPanelMeProfile to LLPanelMe
- LLPanelMeProfileEdit to LLPanelMyProfileEdit

--HG--
branch : product-engine
2009-11-20 22:57:59 +02:00
Steve Bennetts efb512dc65 EXT-2644 - Add "Close Session" option to chicklet context menus 2009-11-18 14:07:35 -08:00
Tofu Linden 3888fed3f6 merge. 2009-11-12 11:57:28 +00:00
Vadim Savchuk 2fd51b4c71 Manual merge.
Resolved conflicts in panel_bottomtray.xml and llavataractions.cpp.

--HG--
branch : product-engine
2009-11-11 21:11:54 +02:00