summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
AgeCommit message (Collapse)Author
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
2010-04-01Automated MergeRoxie Linden
2010-03-31Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-03-30EXT-6634 : INFRASTRUCTURE: Generic header file / #include cleanupLoren Shih
LLAgent.* cleanup Also took out some constants from llagent.cpp that aren't being used.
2010-03-30Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-29Merge latest viewer-hotfix, approximately equal to Viewer 2.0 finalJames Cook
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-26Fixed normal bug EXT-5116 (Voice notification should display on top of IM ↵Mike Antipov
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
2010-03-24Manual merge from default branch.Vadim Savchuk
Resolved conflicts in llpanellandmarks.cpp. --HG-- branch : product-engine
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-19fixed EXT-6472 “No indication about new message/offer if IM window is open ↵Alexei Arabadji
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
2010-03-12mergeVadim Savchuk
--HG-- branch : product-engine
2010-03-10fixed EXT-4872 'Loading...' message remains in ad-hoc IM floated opened by ↵Igor Borovkov
'Start IM' button added timing out of session initialization (after 30 seconds) --HG-- branch : product-engine
2010-03-09fixed EXT-5910 “Offers logging”,Alexei Arabadji
replaced interactive system message marker with correct from string value; --HG-- branch : product-engine
2010-03-08automated mergeRoxie Linden
2010-03-08Merge with viewer 2 beta 4James Cook
2010-03-05fixed EXT-5910 “Offers logging”,Alexei Arabadji
fixed IM message counter when received interactive notification(offer); corrected logging to file of offer notification; enabled logging for FRIENDSHIP_ACCEPTED notification; --HG-- branch : product-engine
2010-03-04Fixed normal EXT-4798 (Voice notifications steal keyboard focus by default)Eugene Mutavchi
--HG-- branch : product-engine
2010-03-02MergeJames Cook
2010-03-01fix for major EXT-5694 Only first recepient from ad-hoc conference is added ↵Ychebotarev ProductEngine
to recent speakers --HG-- branch : product-engine
2010-02-26fixed major EXT-5746 “Voice notifications appear undocked in the top left ↵Alexei Arabadji
corner of viewport”, made LLCallFloater and LLCallDialog force docked state when created; --HG-- branch : product-engine
2010-02-24DEV-46415 Group Call Invite contains SLID with ResidentJames Cook
2010-02-19IM window titles are Display Name (SLID)James Cook
2010-02-19Implemented low task EXT-5215 (Disable showing full yyyy/mm/dd timestamp for ↵Eugene Mutavchi
messages (nearby chat/im) received today) --HG-- branch : product-engine
2010-02-11MergeJames Cook
2010-02-11fix for EXT-5324 'You started a voice call' message appear after first text ↵Igor Borovkov
message in session --HG-- branch : product-engine
2010-02-11Fixed normal bug EXT-5289 ("Cancel" button is missing if call started when ↵Andrew Dyukov
voice notification exists). - Added setting "Cancel" button visible when call is started. --HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 09:09:35 +0000