768a31906a
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2021-02-09 21:08:57 +01:00
ca6121979c
SL-14796 Updated code accordingly to changed event order
2021-02-04 18:06:17 +02:00
160d874a9c
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llui/llchat.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llviewerinventory.cpp
2021-02-03 22:09:42 +01:00
1dd32bb772
SL-14796 After teleporting, add notation into Nearby Chat
2021-02-03 20:05:20 +02:00
fd290b8fdf
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-17 13:31:21 +01:00
d561756d58
SL-14497 Unblocking does not remove voice block
2020-12-08 23:25:34 +02:00
a94b9a4009
SL-14493 Fixed missing display names
...
Name lookup was not inited with capability properly
2020-12-08 21:29:44 +02:00
40b0af5b1c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-20 23:02:29 +01:00
dc8d291c9f
FIRE-10549 - [OPENSIM] Further HG uniformity checks
...
fixes a specific case of manually typed URIs being treated as http links.
adds additional debug for further testing
refactors ambiguous function name gridURL()
2020-11-15 16:46:06 +00:00
c9f988f621
Fix build
2020-11-12 08:47:12 +01:00
af2abe17cd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 00:51:42 +01:00
0303dd8179
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
538e8fb64e
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-05 09:22:31 +01:00
e5e45d08f6
SL-14226 Cleanup teleport requests
2020-10-29 16:10:40 +02:00
67a326116b
Merge branch 'SL-14081' into DRTVWR-513-maint
...
# Conflicts:
# indra/newview/llviewerregion.cpp
2020-10-15 20:23:18 +03:00
95b4dd072e
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-10-15 11:37:14 +02:00
6cbb59e13a
SL-14081 - more teleport logging
2020-10-14 20:50:19 +01:00
d06db587b2
SL-14081 - more detailed logging of teleport process
2020-10-14 20:50:19 +01:00
0a2b748705
SL-14078 No point in verifying display name cap each frame #2
2020-10-12 19:40:22 +03:00
d0fb2a173d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-20 19:50:03 +02:00
cddc7cb040
Merge branch 'rlva/development'
2020-09-19 13:31:34 +02:00
66412b9058
Merge branch 'rlva/development'
2020-09-19 13:12:00 +02:00
9b5a89511a
Merge branch 'rlva/development' into rlva/development
2020-09-16 14:26:53 +02:00
198843fc1a
CATZ-576: Indicate user typing status with @redirchat=n with an optional toggle
2020-09-16 13:54:14 +02:00
aebcd1855d
Change RLVa string constants over to opt-in constexpr string_views (but keep char* by default)
2020-09-16 01:35:44 +02:00
9b03257a1e
Merge branch 'appearance/misc' into rlva/feature/eep
2020-09-14 15:26:13 +02:00
d5dd2c8aeb
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-08-11 19:52:44 +02:00
b14ffa783c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-05 10:45:14 +02:00
e2b18f7078
FIRE-29903 bake fix for universal wearables
...
Contrib by Ubit Umarov
2020-08-05 01:13:40 +01:00
2e179112c7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-01 09:46:00 +02:00
6c4139ca1e
FIRE-29880: Make it more visible that movelock is enabled
2020-07-29 23:55:16 +02:00
93f7f6f237
Fix crash in LLAgent::setAFK()
2020-07-29 12:17:17 +02:00
b0e3bb9184
Merge branch 'viewer/build' into rlva/development
2020-06-11 17:48:32 +02:00
6a05670f6f
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-06-03 09:26:07 +02:00
fe10e1ac46
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-05-28 22:07:28 +02:00
bbe5ce59c8
Remove orphaned method
2020-05-28 15:21:55 +02: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
b6441bf09b
Merge branch 'DRTVWR-500' into DRTVWR-501-maint
2020-04-29 19:34:39 +03:00
27e54f56ad
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
2020-04-23 19:53:01 +02:00
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
a520c01c73
Merge branch 'master' into DRTVWR-501-maint
2020-03-28 01:00:34 +02:00
02c072a0be
Merge branch 'appearance/misc' into rlva/feature/eep
2020-03-21 14:56:22 +01:00
5433f2586c
Merge branch 'viewer/build' into rlva/development
2020-03-21 11:58:04 +01:00
96b9b2f47d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-03-19 09:48:32 +01:00
2324368336
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-03-19 08:10:15 +01:00
331f290f61
Merge master (v 6.3.9) into DRTVWR-440
2020-03-18 15:39:38 -06:00
6662f7348b
Merge branch 'master' into DRTVWR-500
2020-03-18 20:52:51 +02:00
90cbec4a54
Merge DRTVWR-481
2020-02-08 18:43:22 +01:00
0f948988b8
SL-12660 Hide top level domain name and IP address for simulators
2020-02-05 18:39:02 +02:00
Ansariel