summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.h
AgeCommit message (Collapse)Author
2011-01-06STORM-826 (workaround): correct mixed and dos-style line endingsOz Linden
2010-11-15mergeRichard Linden
2010-11-10DN-203 [crashhunters] LLIMModel::LLIMSession::onAvatarNameCachLeyla Farazha
2010-10-27DN-190 Last name resident shown in title of IM Conference Window with no ↵Leyla Farazha
Display name
2010-10-07Made VoiceCallsRejectAll apply to group voice invites as well as p2p and ↵Monroe Linden
ad-hoc invites. Fixed some code in LLIMMgr that had the incoming call dialog confused with a notification. Reviewed by Richard.
2010-09-29MergeLeyla Farazha
2010-09-27MergeLeyla Farazha
2010-09-27STORM-210 FIXED Implemented adding of ad-hoc call participans in Recent.Andrew Productengine
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.
2010-09-08Fixing chat logs to use usernameLeyla Farazha
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-09-17STORM-153 FIXED Localized Conference and non-existent IM session name strings.Andrew Dyukov
- 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.
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-13Change license from GPL to LGPL (version 2.1)Oz Linden
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-05-17DEV-50013 Display name for inbound voice callsJames Cook
(Last commit was actually for outbound). Reviewed with Leyla
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
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-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-08Merge with viewer 2 beta 4James 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-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-03mergeJames Cook
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-01Support returning full_name (and SLID) for LLCacheName::get() callsJames Cook
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
2010-01-29completely got rid of Communicate floater and stuffIgor Borovkov
--HG-- branch : product-engine
2010-01-28got rid of LLFloaterIMPanel usage for EXT-1196 Stalls on startup in ↵Igor Borovkov
LLPanelFriends::refreshNames --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-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-20Reducing include dependence from the "llspeakers.h" through "llimview.h" ↵Mike Antipov
(following by the 7d600b529ee8 commit) --HG-- branch : product-engine
2010-01-20cleanning include list. rearrange the list in imview.cppMike Antipov
--HG-- branch : product-engine
2010-01-06fix for major EXT-3999 (nobody) appears in the Recent tab after receiving ↵Yuri Chebotarev
system notification --HG-- branch : product-engine
2010-01-05Completed low task EXT-3759 (NOTFORBETA0: Phone numbers for AvaLine calls ↵Mike Antipov
should be human readable) -- for now phone number is split on parts by two digits from right to left. The first left part can have 2 or 3 digits, i.e. +44-33-33-44-55-66 or 12-34-56-78-90. --HG-- branch : product-engine
2009-12-28Work on low task EXT-3682 (Dedicated icon is required for AvaLine callers in ↵Mike Antipov
the VCP) -- improved changes for bug EXT-3684 ("Default" icon is used always for group calls in the voice notifications instead of group icon) to process avaline calls --HG-- branch : product-engine
2009-12-26Fixed low bug EXT-3684 ("Default" icon is used always for group calls in the ↵Mike Antipov
voice notifications instead of group icon) -- implemented LLGroupIconCtrl to show group icon for passed group UUID. -- added LLGroupIconCtrl to incoming and outgoing dialogs --HG-- branch : product-engine
2009-12-25moved to base class LLCallDialog method draw();Alexei Arabadji
added check to draw LLCallDialog if floater has dock control; --HG-- branch : product-engine
2009-12-23fixed normal bug (EXT-2787) Outdated voice chat invitation never hides itselfDmitry Oleshko
- P2P and AVALINE invitationswill hide now if a call is not valid anymore - GROUP and ADHOC invitations will stay on a screen --HG-- branch : product-engine
2009-12-23finished EXT-1912 Add handling restrictions of PSTN P2P calls in new IM FloatersIgor Borovkov
chiclets for avaline calls are not spawned anymore --HG-- branch : product-engine
2009-12-22mergeIgor Borovkov
--HG-- branch : product-engine
2009-12-22implemented EXT-3515 Click on IM button for multiple selected Avatars each ↵Igor Borovkov
time creates new IM session --HG-- branch : product-engine