summaryrefslogtreecommitdiff
path: root/indra/newview/llmutelist.h
AgeCommit message (Collapse)Author
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-02-01cleaned up linden_common.h, removing stuff that is mostly unusedRichard Linden
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-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-04-30WIP: normal bug EXT-6865 (Voice isn't blocked for Avaline callers connected ↵Mike Antipov
via PSTN bridge) Applyied Aimee's patch to enable blocking of avaline caller: added an "External" mute type which isn't sent to the SL servers or stored in the cache across sessions. The caller's ID will change each time so there's no point cluttering up the mute list by persisting them. Known issue: Right now the mute is added with the caller's phone number as the name shown in the block list, so that will need changing to "Avaline Caller 1" etc --HG-- branch : product-engine
2010-03-29Merge latest viewer-hotfix, approximately equal to Viewer 2.0 finalJames Cook
2010-03-18Done normal task EXT-6290 ([TRUNCATION] Block List - type shown after name ↵Mike Antipov
is truncated when the name is long. need 'en' xui rework) * Changed the way blocked items are shown in the list. For now they are separated on two columns: Name & Type. If Name is too long it is shown truncated (with ...) * As result remove deprecated methods from LLMute to concatenate its name & type and to extract name & type from the such concatenated string. * reduce include dependence from llmutelist.h --HG-- branch : product-engine
2010-02-17Documented that last name "Resident" is not storedJames Cook
2010-02-03mergeJames Cook
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-25Fixed normal bug EXT-4108 ([BSI] Voice volume sliders do not preserve ↵Mike Antipov
settings per resident between voice sessions) - moved necessary functionality from LLMuteList to LLVoiceClient. It was used only in active speackers floater which is deprecated. - initialized saving/loading of voice level in voice client. - also saving voice levels between session is activated. --HG-- branch : product-engine
2009-10-22Merging revisions 2129-2144 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry * Bugs: EXT-1293 EXT-1611 EXT-1613 EXT-1176 EXT-1724 EXT-1186 EXT-1662 EXT-1760 EXT-1720 * Dev: EXT-1575 EXT-1770 EXT-1232 EXT-1234
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-06-27QAR-669 1.20 Viewer RC11Steven Bennetts
QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-04-30svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 ↵James Cook
maint-ui-11-qa).
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
2007-12-19svn merge -r 75354:76103 ↵Jon Wolk
svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-01-02Print done when done.James Cook