55baa89640
Merge viewer-bear
2017-05-18 08:55:43 +02:00
bb3380b220
MAINT-7359 improve new Avatar Render Settings window
2017-05-10 15:41:16 +03:00
9c7ac9e101
Merge viewer-neko
2017-03-15 19:55:39 +01:00
d23b6e442e
MAINT-7168 Avatar rendering settings adjustments
2017-03-15 12:08:30 +02:00
143b77acc5
Transplant MAINT-7076 Add the ability to see/modify mute types within the block list
2017-03-03 20:47:12 +01:00
bff6a3af15
Merge viewer-neko
2017-02-23 09:02:58 +01:00
605160d501
MAINT-7118 Swapping legacy people API with new cache
2017-02-15 20:40:03 +02:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
7fceb3a63f
Merged in lindenlab/viewer-cleanup
2016-11-14 22:04:37 +02:00
5828d06114
SL-448 Implement a limit to block list
2016-10-26 15:10:40 +03:00
c92eb7e591
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-08-30 11:36:06 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
354812cc68
Merge Firestorm LGPL
2016-01-16 19:10:08 +01:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
5f7b0c5a59
Merge viewer-bear
2016-01-13 12:34:02 +01:00
f6d995b0a2
MAINT-6018 Open URL dialog spam
...
Remove notifications of muted agents
2016-01-11 03:35:24 +02:00
4144783a64
Merge Firestorm LGPL tip
2015-11-21 17:39:28 +01:00
b0542a1a46
Refactor FSCommon
2015-11-14 01:36:57 +01:00
9848fc4253
merge changes for 4.0.1-release
2016-01-15 17:01:16 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
11c428759e
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2015-11-02 14:09:43 -05:00
5524d38dff
Merge viewer-quickgraphics
2015-10-03 16:38:26 +02:00
58db350223
MAINT-5622: correct rendering of explicitly derendered and blocked avatars
2015-09-11 17:59:29 -04:00
a45d3d8421
Merge Viewer-Bear
2015-06-20 15:35:15 +02:00
3fc39776dd
MAINT-5232: Remove dubious polling in LLMuteList::getInstance().
...
The LLMuteList singleton instance might be requested before gMessageSystem is
constructed. LLMuteList wants to register a couple gMessageSystem callbacks.
Since gMessageSystem is not (yet) itself an LLSingleton, LLMuteList's
constructor can't just call it into existence. Until now, LLMuteList overrode
LLSingleton's getInstance() method: every time getInstance() was called, the
subclass override method would check whether gMessageSystem had been
initialized, and if so, register its callbacks before forwarding the call to
the base-class LLSingleton::getInstance() method.
Change to use LLPounceable::callWhenReady() instead.
This is the reason gMessageSystem was made an LLPounceable.
2015-05-27 14:38:51 -04:00
833579b14b
MAINT-5232: Convert gMessageSystem != NULL to simple bool test.
...
Now that gMessageSystem is an LLPounceable, we would either have to define
comparisons to LLPounceable's held type or static_cast<LLMessageSystem*> to
literally compare to NULL. But since we already define operator bool(), that's
the easy (and idiomatic) fix.
2015-05-23 13:34:34 -04:00
ca446ad0b7
MAINT-5036 FIXED Blocked user can send invites to group
2015-04-07 12:06:23 +03:00
9146989ec2
FIRE-15746: Add option to show block report in nearby chat
2015-03-22 15:54:10 +01:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
ec38707cf8
Fixed wrong return condition for LLMuteList::isMuted
2014-01-22 14:12:57 +01:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
9e451513d9
MAINT-3069 FIXED Adding/removing item from blocklist blocks viewer up to a disconnect
2013-09-11 11:21:27 +03:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8146bbda39
Merge
2013-07-09 16:26:07 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
c0450ad230
More code cleanup
2013-07-08 17:23:17 +02:00
00634cdd70
optimize LLMuteList::isMuted; Don't check any lists if the users mute list is emoty anyway. Only pay the price if someone is muted.
2013-04-24 00:04:23 +02:00
f0986b43d9
More trivial EOL fixes
2013-01-30 20:09:55 -07:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
52c7241aed
FIRE-8540: Make sure we don't mute ourself if we added a legacy mute by name with our name
2012-12-09 15:17:13 +01:00
46ac35a2a4
Fixed LLMuteList::remove(): Return the correct return value instead of always FALSE
2012-12-05 11:53:24 +01:00
404414ee7f
FIRE-8460: Added profile button to mute list
2012-12-05 11:18:28 +01:00
9db7a97ace
FIRE-4855/FIRE-8268: Fix for objects muted by name not being muted it worn as attachment
2012-11-19 20:58:50 +01: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
Ansariel