Age | Commit message (Collapse) | Author |
|
chat, after adding more participants.
- Added a parameter to LLAvatarActions::startConference() and LLIMMgr::addSession() to pass the uuid of a P2P IM floater which should be used to start a new conference in it.
- In LLChicletBar::sessionRemoved() we don't close the IM floater if it is going to be re-used for a new conference.
|
|
|
|
Fixed boost trackable objects usage.
|
|
IM you)
- If "Only friends and groups can IM me" option is ON but the user got message from non-friend, show notification one time per session.
|
|
side toolbar with call request dialog active on Mac
* Added "on button removed" callback for toolbars.
* Changed docking on incoming and outgoing call floaters to be undocked when "speak" button removed.
Reviewed by Leyla.
|
|
when speak button in side toolbar)
- LLDockableFloater::getDockTongue to init dock tongue with proper image depending on floater dock side, also added images for left and right tongues.
- Added proper call floater positioning relatively to the speak button
|
|
- Floaters dock to chiclets at the bottom.
- Floaters docking region limited to non-toolbar view.
- Chiclet bar is positioned between the right toolbar and the minimized floaters stacked at the top left corner by default.
|
|
name.
Added conversions from legacy names or SLURLs with avatar id to the user names in cases of logging P2P sessions and inventory offers.
Removed asynchronous writes to temporary IM log file depending on name cache responses.
|
|
|
|
|
|
|
|
Display name
|
|
ad-hoc invites.
Fixed some code in LLIMMgr that had the incoming call dialog confused with a notification.
Reviewed by Richard.
|
|
|
|
|
|
Both offline and online users are added. It is done in LLVoiceChannelGroup::activate(), where TODO for it was placed earlier.
To avoid code duplication when adding users from speakers list to Recent, a new method was added to LLIMModel.
|
|
|
|
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
|
|
|
|
- Moved the "no session" string to XML and used it in code instead of hardcode.
- Conference string turned out to be already translated, but the way translation was happening ad-hoc chat log files on disk
would get localized names, and thus be inconsistent (and that would create problems with browsing them later).
It didn't happen already just because this string wasn't translated in other locales somewhy.
So moved localization of session name after the the creation of log file.
Also changed value of string according to Eli's comment in ticket.
|
|
back-out the back-out for this branch. yay.
|
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
|
|
|
|
string for incoming ad-hoc chats.
Added a new string "conference-title-incoming" to strings.xml
For now the "Conference" word is localized wherever this session name is shown:
* IM window title
* Voice notifications
Further Localization is out of scope of this ticket and will be done in a separate localization cycle.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/816/
--HG--
branch : product-engine
|
|
(Last commit was actually for outbound). Reviewed with Leyla
|
|
|
|
--HG--
branch : product-engine
|
|
|
|
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
|
|
window, not under.)
Replaced sending voice notifications to front (in floater view) with adding them to popup view.
In this case Voice Notifications are shown on top even IM window has focus. And Resident can continue enter the text when Voice notification is shown.
Reviewad by Vadim at https://codereview.productengine.com/secondlife/r/120/
--HG--
branch : product-engine
|
|
Resolved conflicts in llpanellandmarks.cpp.
--HG--
branch : product-engine
|
|
but not in focus”,
allowed to increment IM message counter when IM window is opened but doesn't have focus and reset IM counter when IM window get focus;
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/76/
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
'Start IM' button
added timing out of session initialization (after 30 seconds)
--HG--
branch : product-engine
|
|
|
|
messages (nearby chat/im) received today)
--HG--
branch : product-engine
|
|
|
|
incorrectly who ended the call)
- Added flag to voicechannel which is true when call is ended by agent.
- It is sent to imview via signal and used to properly customize text in outgoing call floater.
--HG--
branch : product-engine
|
|
window, not under.)
- added moving notifications floaters to front in the floater view while opening.
--HG--
branch : product-engine
|
|
|
|
removed redundant call status notifications: ringing, connected, hang_up,
unavailable, answering;
--HG--
branch : product-engine
|
|
Changed callback signature to full_name instead of first_name,last_name
Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
Change Pay dialog names to SLURL links
Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit
Consolidate name first + " " + last concatenation in LLCacheName::buildFullName()
Reviewed with Kelly
|
|
--HG--
branch : product-engine
|
|
LLPanelFriends::refreshNames
--HG--
branch : product-engine
|
|
made voice status messages displayed in pop-out window;
--HG--
branch : product-engine
|
|
* for outgoing ad-hoc sessions chat history is saved into new file for every distinct set of initial participants
format: ["Ad-hoc Conference" "hash"<md5 hash of sorted participants' UUIDs>.txt]
ex: Ad-hoc Conference hash77a0ff26-614d-0dbd-ce19-5da9108f141a.txt
* for incoming ad-hoc sessions, chat history of each session is saved into a separate file:
format: [<ad-hoc session name> <timestamp> <4 first symbols of session id>.txt]
ex: Igor ProductEngine Conference 2010_01_22 07_41 2752.txt
--HG--
branch : product-engine
|
|
(following by the 7d600b529ee8 commit)
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
system notification
--HG--
branch : product-engine
|