summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
AgeCommit message (Collapse)Author
2011-01-06STORM-826 (workaround): correct mixed and dos-style line endingsOz Linden
2010-12-02mergeMonroe Linden
2010-11-24Pull from viewer-betaMerov Linden
2010-11-23(DN-211) Conference call dialog shows Conference with ??? (???) in title ↵Leyla Farazha
header with view display names on and off Inbox X
2010-11-23STORM-102: this is to correct a minor issue with ad-hoc conferences so that ↵Wolfpup Lowenhar
they do not get date stamped at all since each one is defined as a unique conversation.
2010-11-23DN-211 Conference call dialog shows Conference with ??? (???) in title ↵Leyla Farazha
header with view display names on and off
2010-11-18STORM-654 : Person to Person chat logs are not created if Display Names are offWolfpup Lowenhar
Modified code in indicated changeset to correct problem after consulting with Leyla Linden who sugested the orginal change. This fix will convert the Legacy name to a user name id not useing Display Names.
2010-11-15mergeRichard Linden
2010-11-12STORM-102 : STORM-143 :Removed unneeded code in llimview.Wolfpup Lowenhar
2010-11-11STORM-102 : STORM-143 :Made needed changes to code to improve searching for ↵Wolfpup Lowenhar
previous logs and also changed the name used for P2P IM log file names. The latter change is going to temporarely break personal content for those that are saving conversation logs as P2P IM logs will now be useinf the user name and not the legacy name.
2010-11-01STORM-255 : merge with viewer-developmentMerov Linden
2010-11-01merge from viewer-betaMerov Linden
2010-10-27DN-190 Last name resident shown in title of IM Conference Window with no ↵Leyla Farazha
Display name
2010-10-27Made changes to setting names and in pannel_preferences_chat.xml for better ↵Wolfpup Lowenhar
understanding as per Esbee's comments in STORM-255
2010-10-25Merge from Viewer-developmentWolfpup Lowenhar
2010-10-25pull viewer-beta in viewer-developmentMerov Linden
2010-10-25DN-181 Chat & IM logs saved in unreadable .llsd instead of .txt - fixing ↵Leyla Farazha
saving of p2p logs
2010-10-25Inverting settings and test so that telling other how to turn off the ↵Wolfpup Lowenhar
messages popping is easier as per discussion with Oz and Boroondas also correcting some minor spelling issues
2010-10-22DN-181 Chat & IM logs saved in unreadable .llsd instead of .txtLeyla Farazha
2010-10-21Merge from Viewer-developmentWolfpup Lowenhar
2010-10-19STORM-402 FIXED Fixed adding of people whom you sent IM to Recent list.Andrew Productengine
This regression was caused by fix of STORM-126 in changeset 09f13edf6aa8 where adding of people from mInitialTargetIDs was removed. And it was used to add people whom you P2P im'ed. - Used mInitialTargetIDs to add people whom you P2P im'ed.
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-10-05Fix for EXP-131 "Call dialog shown in locked position when a Resident calls ↵Monroe Linden
a Skylight visitor" Added the setting VoiceCallsRejectAll, which causes the viewer to silently reject all incoming voice calls. Reviewed by Callum.
2010-10-15fixing ims not logging with display names offLeyla Farazha
2010-09-29MergeLeyla Farazha
2010-09-27MergeLeyla Farazha
2010-09-27[STORM-255] As a user I would like to disable incoming Group/IM toasts from ↵Wolfpup Lowenhar
showing up. This will also take care of STORM-221 since the person that would be affected by the toast cha now disable them.
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-27STORM-153 ADDITIONAL FIX Properly fixed unlocalized chiclet tooltip and ↵Andrew Productengine
syswell session names for adhoc. Bug was caused by using unlocalized name of session as argument in LLIMModel::newSession() after the session name was localized in constructor. - Used correct session name in LLIMModel::newSession(). Adding similar logic to addMessage() turned out to be unnecessary and also caused regression (VWR-23180), so previous fix of the same bug(8ab901af1241) was backed out in 28ed1b4cf4cd. Erroneous part was excluded from this fix.
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-25Backed out changeset 8ab901af1241Tofu Linden
Was causing LEAP-2 (forensics by Boroondas)
2010-09-23STORM-153 ADDITIONAL FIX Fixed unlocalized chiclet tooltip and syswell ↵Andrew Productengine
session names for adhoc. Bug was caused by using incorrect (unlocalized) name of session as argument for some methods after the session name was localized in constructor. - Used correct (localized) session name instead.
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-26Manual merge from default branchVadim Savchuk
--HG-- branch : product-engine
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 08:40:25 +0000