summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
AgeCommit message (Collapse)Author
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-24EXT-8672 FIXED ([HARD CODED] ALL LANGS The word \"Saved\" is hard coded, in ↵Paul Guslisty
the long timestamp displayed in IM when user is offline) - Created a string with a time stamp parameter and added it to the strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/872/ --HG-- branch : product-engine
2010-08-19EXT-8658 FIXED Made only online participants of Adhoc chat to be shown shown ↵Andrew Dyukov
in Recent Tab. Used previously commented code which adds only online paricipants instead of current code that added all. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/860/ --HG-- branch : product-engine
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-04Merge with dessie/viewer-releaseLeyla Farazha
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27Merge from dessie/viewer-releaseLeyla Farazha
2010-07-30mergeRichard Nelson
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-07-29EXT-8429 FIXED Added a workaround to localize server hardcoded "Conference" ↵Mike Antipov
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
2010-07-19Merge with dessie/viewer-releaseLeyla Farazha
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-12EXT-8246 FIXED Disabling an adding of items into Recent People list in case ↵Mike Antipov
of incoming ad-hoc chat. REASON: it was implemented in EXT-5694 to add all ad-hoc participants when user send a message to session created himself. Participants IDs are known in this case. But in case of incoming ad-hoc chat those IDs are not known. Container used to get IDs contains only Ad-hoc Session ID. So, (???) is expected in this case in Recent People Panel. FIX: disabling adding of items into Recent People list in case of incoming ad-hoc chat. Note: participants will be added to the list once they send a message to chat. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/724/ --HG-- branch : product-engine
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-06-30EXT-8065 FIXED added hiding Start IM button on a group call invitation dialogIgor Borovkov
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/675/ --HG-- branch : product-engine
2010-06-25EXT-4872 FIXED hiding Start IM button for ad-hoc call invitationIgor Borovkov
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/658/ --HG-- branch : product-engine
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-18EXT-6710 FIXED Corrected 'ItemsShared' notification message and provided ↵Alexei Arabadji
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-02DEV-50451 Fix names in local chat history loading, againJames Cook
Switch to new serialization format, change filename so old viewers don't get confused if the user switches back. Reviewed with Richard
2010-06-01Merge with dessie/viewer-public in prep to land code thereJames Cook
2010-06-01DEV-50439 Legacy name shown in Title of Voice Call dialogJames Cook
Wasn't updating window title with correct name. Also fixed outgoing call dialog. Reviewed with Simon.
2010-05-28DEV-50202 IM toast notification shows SLID and flashing info iconJames Cook
Fixed to use Display Name (Username), fixed icon placement, also fixed notifications system well names. Reviewed with Leyla.
2010-05-28EXT-7118 FIXED Changed text in group call invite.Andrew Dyukov
- Changed group invite string from "has joined a Voice Chat call with the group [GROUP]" to "just joined '[GROUP]' voice channel." - Added special string for group invite question saying "Would you like to leave [CURRENT_CHAT] and join the call with '[GROUP]'"? - Hooked up this string in code. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/458/ --HG-- branch : product-engine
2010-05-25DEV-50013 Display names load at startup in local chat/IM historyJames Cook
Had to change the chat log file format to include agent_id. Code will load viewer 2.0 logs, but viewer 2.0 will just discard data from 2.1 logs, which seems OK. Reviewed with Leyla.
2010-05-21Rename LLAvatarName::getNameAndSLID() to getCompleteName()James Cook
Discussed with Leyla/Richard
2010-05-20DEV-50013 Convert call dialogs to use Display NamesJames Cook
Reviewed with Leyla
2010-05-19Merge pull from dessie/viewer-publicLeyla Farazha
2010-05-18Rename mSLID to mUsername to match the name of the field in the UIJames Cook
Product made a late-breaking request to change the name of this field. The wire protocol for People API has not yet changed.
2010-05-19EXT-7158 FIXED Moved lltextutil from newview to llui library.Sergei Litovchuk
Reviewed by Richard Nelson and Mike Antipov at https://codereview.productengine.com/secondlife/r/363/ --HG-- branch : product-engine
2010-05-17DEV-50013 Display name for inbound voice callsJames Cook
(Last commit was actually for outbound). Reviewed with Leyla
2010-05-17DEV-50013 Display name for inbound voice callsJames Cook
2010-05-13merge pull from dessie/viewer-public, picking up SLE codeJames Cook
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-05-04Automated mergeRoxie Linden
2010-04-28Fixed low bug EXT-6776 ([FRAGMENTATION] Call strings need change).Andrew Dyukov
- Removed string fragmentation by changing concatenation of name and action to whole-sentence strings. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/328 --HG-- branch : product-engine
2010-04-23Fixed normal bug EXT-6893 (Corrupted 'Connecting to conference' notification ↵Andrew Dyukov
is shown while connecting to ad-hoc voice chat). Bug consisted of two problems- showing empty outgoing call floater and corrupted text in outgoing call floater. First was ad-hoc and group call specific and was caused by not showing appropriate text for STATE_READY voice channel state. Second was caused by too small space between "Connecting to..." and "Leaving..." textboxes, which enden in their collision for long names. - First problem was fixed by adding STATE_READY case into appropriate switch where textboxes are made visible. - Second was solved by placing "Leaving..." textbox lower Reviewed by Vadim Sachuk at https://codereview.productengine.com/secondlife/r/310/ --HG-- branch : product-engine
2010-04-21Automated mergeRoxie Linden
2010-04-21Fixed normal bug EXT-6909 ('Mute/unmute' moderation options remain enaibled ↵Mike Antipov
after moderator left group call) Reason: session's Speaker Manager was not updated when voice call ended. Speakers had incorrect voice related state. Fix: update speakers' state when voice call is finished. Also VCP now uses LLIMMgr::endCall to perform "Leave Call" action. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/276/ --HG-- branch : product-engine
2010-04-19CR Changes from AimeeRoxie Linden
2010-04-17merge from viewer-hotfixTofu Linden
2010-04-16Fixed major bug EXT-6869 (Viewer crashes when switching between group voice ↵Mike Antipov
sessions) The reason: LLCallDialogManager did not disconnect from "voice channel state changed" signal on channel in previous session. Thus when old channel changes state from STATE_HUNG_UP to STATE_CALL_STARTED there is invalid pointer to session in connected LLCallDialogManager::onVoiceChannelStateChanged callback before current voice channel is changed and pointer to session becames valid. Fix: add storing of connection to signal in voice channel from previous session and disconnect it before connecting to channel in current session. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/244/ --HG-- branch : product-engine
2010-04-14DEV-48904 - p2p acceptance dialog vanishes too quicklyRoxie Linden
DEV-48903 - malformed names in p2p dialogs for Diamondware In the merge there were some changes that didn't get propagated that resulted in some failures with respect to diamondware name processing. THe determination as to whether a p2p session was with an avatar or with an alcatel (pbx) wasn't propagated into the diamondware code. I fixed that by merging the changes to the vivox module with respect to that into the diamondware module. Also, the acceptance dialog was vanishing too quickly as the determination as to whether there was still a p2p invite pending was not updated when the calling code was updated. The calling code initially was changed to look into vivox state which isn't really valid. that was changed in the 'trunk' to another mechanism, but that still assumed visibility into the voice code. I fixed that by creating an API call to ask whether a call was pending. CR: Karina
2010-04-19automated merge with trunkRoxie Linden
2010-04-13Fixed low bug EXT-5844 (Group chat invite appears when voice is disabled ↵Andrew Dyukov
because connection problem). - Added additional check for client's voice working properly before inviting to session. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/228/ --HG-- branch : product-engine
2010-04-09Fixed normal bug EXT-6319 (Rejected voice call says "user Joined the voice ↵Andrew Dyukov
call"). - Removed names from strings containing info about other user joining or ending the call to make them more general. See comment to JIRA ticket for more info. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/210/ --HG-- branch : product-engine
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 21:41:08 +0000