970ee73e9a
Fix release merge issues (included upstream changes not yet in release from bear)
2013-10-25 11:48:43 -07:00
9e451513d9
MAINT-3069 FIXED Adding/removing item from blocklist blocks viewer up to a disconnect
2013-09-11 11:21:27 +03:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
08c424e511
STORM-1878: Blocking an avatar does not derender worn lights
2012-06-10 14:18:38 +02:00
23717a0918
BUG STORM-1004 FIXED Unblocking/blocking name sometimes deletes identically named entry, but of different TYPE
...
LLMuteList stores muted objects in two sets: set of names and set of ids. Avatar objects are stored by ids (set of ids), other objects can be stored both by name(set of names) or ids
- Delete items from corresponding set (from set of names or ids), not form both sets at time.
- Improved isMuted method's logic. Now if avatar is tested whether it's muted or not, don't search its name in the set of names.
2011-02-18 15:28:38 +02:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
78eed3fc07
WIP: normal bug EXT-6865 (Voice isn't blocked for Avaline callers connected 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-04-30 13:25:48 +03:00
ecc2c72650
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
2010-03-29 16:55:22 -07:00
1550729348
Done normal task EXT-6290 ([TRUNCATION] Block List - type shown after name 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-03-18 18:13:39 +02:00
42176145c9
Converted names build from avatar object LLNameValue pairs to SLID
...
Added temporary getDisplayName() to LLCacheName
Moved temporary placeholder display names into LLCacheName
Eliminated rarely used LLAgentUI::buildName in favor of buildFullName
Standardized buildFullName capitalization
2010-02-08 14:55:30 -08:00
88350edbcb
merge
2010-02-03 14:13:56 -08:00
146e9d5e4d
Support returning full_name (and SLID) for LLCacheName::get() calls
...
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-02-01 17:06:18 -08:00
69c676c6eb
got rid of llimpanel.h includes for EXT-1196 Stalls on startup in LLPanelFriends::refreshNames
...
--HG--
branch : product-engine
2010-01-28 18:34:42 +02:00
70b6d603ed
got rid of LLFloaterIMPanel usage for EXT-1196 Stalls on startup in LLPanelFriends::refreshNames
...
--HG--
branch : product-engine
2010-01-28 18:30:58 +02:00
6e932911d5
Related to normal bug EXT-4108 ([BSI] Voice volume sliders do not preserve settings per resident between voice sessions)
...
- moved default internal voice level value into application settings
- cleanned up include list in llmutelist.cpp
--HG--
branch : product-engine
2010-01-25 17:29:57 +02:00
2ea3fd9563
Fixed normal bug EXT-4108 ([BSI] Voice volume sliders do not preserve 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
2010-01-25 17:06:35 +02:00
69c803fec5
cleanning include list. rearrange the list in imview.cpp
...
--HG--
branch : product-engine
2010-01-20 21:02:41 +02:00
82de841c52
merge
...
--HG--
branch : product-engine
2010-01-19 17:13:21 +02:00
66f5f2b922
EXT-4470 Several bad assumptions that LL_PATH_PER_SL_ACCOUNT is always good (which it isn't until after login)
...
To be reviewed by Soft!
2010-01-18 14:07:03 -08:00
f28778b8b8
work on EXT-4322 Remove the Communicate floater
...
leave some LLFloaterChat usages commented for later review...
--HG--
branch : product-engine
2010-01-18 17:50:19 +02:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
ea0abdac1d
IM: cleaned up includes of old im floater stuff llimpanel.h
...
--HG--
branch : product-engine
2009-10-29 16:49:06 +02:00
b5ffeaff1a
merge -r 2014-2032 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
...
* Bugs: EXT-1005 EXT-1488 EXT-320 EXT-1236 EXT-1236 EXT-1002 EXT-1030
* New Dev: EXT-1293 EXT-1416
2009-10-14 20:37:03 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
9dfe0ca9a0
svn merge -r121194:121210
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-22 09:58:47 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
46f8fb8781
svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
...
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
2009-02-03 21:15:57 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
667ca55bad
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2009-01-05 18:59:12 +00:00
b406972af1
svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporating:
...
QAR-892 Windows installer that pings secondlife.com on launch
QAR-837 Six New Languages in the Installer
QAR-908 downloader-support-1 merge
2008-10-28 23:56:20 +00:00
afe61eb994
QAR-849 merge maint-viewer-10-merge 96838-97237 -> release
2008-09-23 01:53:11 +00:00
926ea0b39a
QAR-669 1.20 Viewer RC11
...
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27 21:02:01 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
63e7894148
QAR-570 maint-render-4 merge
...
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
36fccc3888
svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa).
2008-04-30 23:30:09 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
7dd08303a3
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-19 00:56:59 +00:00
facf67ae32
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
...
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
050dad0ce3
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
2007-11-07 22:55:27 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
13c391f198
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
...
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
2007-09-14 21:13:20 +00:00
0bd992b07c
SL-51287 Muted users not visibly shown anymore
...
SL-54168 "Users muted by voice are also muted by text".
Updated Vivox SDK 2.0.2318.
(josh: This appears to be svn merge -r 68529:69170 svn+ssh://svn/svn/linden/branches/bhear3-maintenance1)
2007-09-07 22:31:26 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
7138fb673a
Merge down from Branch_1-18-1:
...
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-08-02 01:18:34 +00:00
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
3e9872a297
merge -r61423:62602 svn/branches/maintenance --> release
2007-05-30 17:39:09 +00:00
4ecb9cb63e
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
2007-05-01 21:39:25 +00:00
Graham Linden