summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
AgeCommit message (Collapse)Author
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-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-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-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-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-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-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-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
2010-02-10Fixed normal bug EXT-4566 ([BSI] private chat end floater reports ↵Andrew Dyukov
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
2010-02-09Fixed normal bug EXT-5116 ( Voice notification should display on top of IM ↵Mike Antipov
window, not under.) - added moving notifications floaters to front in the floater view while opening. --HG-- branch : product-engine
2010-02-05Fixed normal bug EXT-4397 (Call isn't ended after disabling voice).Andrew Dyukov
- Added customizing string with notification about ending call depending on voice availability. - Added closing of open VCP if voice is disabled. --HG-- branch : product-engine
2010-02-03fix for reopened EXT-4578 Noninteractive voice notifications should have ↵Igor Borovkov
close affordance --HG-- branch : product-engine
2010-02-03fixed EXT-4764 “Forbid connecting to different voice channels at once”,Alexei Arabadji
removed redundant call status notifications: ringing, connected, hang_up, unavailable, answering; --HG-- branch : product-engine
2010-02-01Fixed major bug EXT-4798 (Voice notifications steal keyboard focus by default)Eugene Mutavchi
--HG-- branch : product-engine
2010-01-29Fixed major bug Bug EXT-4759 (Second incoming call notification doesn't ↵Andrew Dyukov
appear if first call was canceled by caller). - Bug was caused by simply closing invite floater when call becomes invalid, so pending invite wasn't removed from IM manager and later this caused failure of check on which floater is shown. Added clearPendingAgentListUpdates() and clearPendingInvitation() before closure. --HG-- branch : product-engine
2010-01-29Mere from default branchVadim Savchuk
--HG-- branch : product-engine
2010-01-29completely got rid of Communicate floater and stuffIgor Borovkov
--HG-- branch : product-engine
2010-01-28CID-382Tofu Linden
Checker: UNINIT_CTOR Function: LLCallDialog::LLCallDialog(const LLSD &) File: /indra/newview/llimview.cpp
2010-01-28got rid of LLFloaterIMPanel usage for EXT-1196 Stalls on startup in ↵Igor Borovkov
LLPanelFriends::refreshNames --HG-- branch : product-engine
2010-01-27Fixed low bug EXT-4647 ("Leaving nearby voice ..." appears when you're not ↵Andrew Dyukov
connected to nearby voice channel). - Added flag to check whether to show "Leaving ...". It is false only if voice in parcel is disabled and channel we leave is nearby. --HG-- branch : product-engine
2010-01-27EXT-3783 “System messages displayed in nearby chat”,Alexei Arabadji
added missing floater_call_info.xml; avoided recreation of LLCallInfoDialog with the same message; --HG-- branch : product-engine
2010-01-26fixed EXT-4643 “IM toasts don't appear after few teleport offers were sent ↵Alexei Arabadji
to that avatar” corrected checking opened active IM session; corrected restoring active IM session after logging IM notification; --HG-- branch : product-engine
2010-01-26fixed EXT-3783 “System messages displayed in nearby chat”,Alexei Arabadji
made voice status messages displayed in pop-out window; --HG-- branch : product-engine
2010-01-25implemented EXT-4567 [BSI] private voice floaters do not contain standard X ↵Igor Borovkov
buttons --HG-- branch : product-engine
2010-01-22implemented EXT-4523 Log for all Ad-Hoc conferences is stored in one fileIgor Borovkov
* 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
2010-01-20cleanning include list. rearrange the list in imview.cppMike Antipov
--HG-- branch : product-engine
2010-01-20Fixed major bug EXT-4364 ( Crash clicking "View IM & Chat" when someone else ↵Mike Antipov
joins group call) - disabled processing of Incoming dialog buttons' clicks after viewer is disconnected --HG-- branch : product-engine
2010-01-19mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-19fixed EXT-3609 IM Floater that Opens Upon Friendship Acceptance Shows ↵Igor Borovkov
Accepting Av as Offline When They Aren't --HG-- branch : product-engine
2010-01-18work on EXT-4322 Remove the Communicate floaterYchebotarev ProductEngine
leave some LLFloaterChat usages commented for later review... --HG-- branch : product-engine
2010-01-14Automated merge with ssh://angela@hg.lindenlab.com/james/gooeyangela
2010-01-14EXT-3795 First run messages still display (click & drag on map, Build tools ↵angela
open, movement controlled, etc)