37706ddecb
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-09-23 08:31:50 +02:00
4bbdafb17e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 08:31:25 +02:00
86e7cc3d35
Merge branch 'master' v6.4.9 into DRTVWR-497
2020-09-22 15:28:13 -06:00
c5a661df67
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-07-13 20:17:12 +02:00
3630beed07
Additional logging for SL-13397
2020-07-09 12:12:54 -06:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
fe3a56f343
SL-11360 Added tags to all debug statements in LLGroupMgr
2020-02-18 16:52:56 +02:00
85fb2b81d8
SL-11360 Viewer floods the server with GroupProfileRequest
2020-02-14 18:37:25 +00:00
90cbec4a54
Merge DRTVWR-481
2020-02-08 18:43:22 +01:00
9621dd8bbd
SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Work
2019-11-22 20:18:30 +02:00
65550520ed
SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Group-related costs and limits via benefits.
2019-11-15 15:13:11 +00:00
5e11d2725d
Merge Firestorm LGPL
2019-06-13 18:29:33 +02:00
a4a8f7e228
FIRE-19734/BUG-227094 Persistent notification cache causes UDP high rate spam on startup
...
Add a simple request time cache to prevent spam
2019-06-05 13:11:39 +01:00
3adc5c2b50
Merge viewer-neko
2019-03-26 19:15:36 +01:00
4434c3371c
SL-2857 Fixed Role picker stuck on Loading
2019-03-20 21:00:26 +02:00
4b19e4c1a5
Merged with RLVa tip
2018-06-18 01:09:54 +02:00
fcac8d4b83
Fixed comments
...
--HG--
branch : RLVa
2018-06-17 17:24:09 +02:00
577288d236
Merged with RLVa features & fixes
2018-05-26 18:08:53 +02:00
24148cbf4e
Added @setgroup:<uuid|name>;<role>=force cause a bunny made me do it
...
--HG--
branch : RLVa
2018-04-30 23:00:42 +02: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
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
a50faa943c
Merge.
2016-04-01 12:59:37 +02:00
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
b8c1976460
Merge
2016-03-17 13:14:21 -07:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
e7ade840e4
Merge viewer-bear
2016-01-24 14:00:30 +01:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
e7eaa94dfa
Merge VR
2016-01-15 13:36:38 -08:00
c9a81ae079
MAINT-6041 Crash in LLGroupMgr::processGroupPropertiesReply
...
Added a Null check
2016-01-12 19:20:54 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
b4f4d78eda
Merge.
2015-11-04 10:36:39 +01:00
9130254fc7
MAINT-5758 FIXED "Ban Member" from the group chatters list context menu
...
is greyed out once you have performed a ban, until you load the group
members list from group info.
2015-10-27 14:04:25 +02:00
eccafc5c40
MAINT-5758 FIXED "Ban Member" from the group chatters list context menu
...
is greyed out once you have performed a ban, until you load the group
members list from group info.
2015-10-27 14:04:25 +02:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
53b947e039
Merge from viewer release.
2015-10-19 12:03:08 -07:00
75c6549fde
Set consistent terminology for yield/wait -> suspend for coroutines.
2015-09-18 11:39:22 -07:00
97236a42ca
MAINT-5507: Remove HTTPClient and related cruft.
2015-09-14 11:15:23 -07:00
96bb17f20b
Merge
2015-08-25 11:40:36 -07:00
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02:00
9e64435bd2
MAINT-5219 FIXED "Ban Member" from the group chatters list context menu is greyed out
...
when you have the ability to manage the ban list
2015-08-13 07:53:38 +03:00
efa9a0f99c
Backed out changeset bab1000e1b2d: restore 'selfless' changes
2015-07-10 19:30:10 -04:00
247eb0c9c3
Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5
2015-07-07 19:41:27 +01:00
b262ded7e0
MAINT-5351: Remove 'self' parameter from coroutine functions.
...
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
2015-07-01 18:33:29 -04:00
80d17b2dd9
MAINT-4952: Use IntrusivePtr for BufferArray,HttpHeaders,HttpOptions.
...
Specifically, change the ptr_t typedefs for these LLCore classes to use
IntrusivePtr rather than directly using boost::intrusive_ptr. This allows us
to use a simple ptr_t(raw ptr) constructor rather than having to remember to
code ptr_t(raw ptr, false) everywhere. In fact, the latter form is now invalid:
remove the now-extraneous 'false' constructor parameters.
2015-06-29 17:19:51 -04:00
a45d3d8421
Merge Viewer-Bear
2015-06-20 15:35:15 +02:00
d0d58c41b4
Default headers added.
...
Group manager finished conversion.
Outfit folders coverted.
2015-06-04 17:36:24 -07:00
Ansariel