0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
314639426d
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llchat.h
# indra/llui/llcombobox.cpp
# indra/llui/llcontainerview.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.cpp
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmultifloater.cpp
# indra/llui/llmultifloater.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/llui/llspinctrl.cpp
# indra/llui/llspinctrl.h
# indra/llui/lltabcontainer.cpp
# indra/llui/lltabcontainer.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llui/llview.h
# indra/llui/llviewereventrecorder.cpp
# indra/llxml/llcontrol.cpp
# indra/llxml/llcontrol.h
# indra/newview/llagentlanguage.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchicletbar.cpp
# indra/newview/llfloaterbuildoptions.cpp
# indra/newview/llfloaterbuildoptions.h
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llfloaterconversationpreview.h
# indra/newview/llfloaterdestinations.h
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterjoystick.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llfloaterpay.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloaterscriptdebug.h
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llfloatersearch.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llmediactrl.h
# indra/newview/llmoveview.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnotificationlistitem.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelprofileclassifieds.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewnotecard.h
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/llsyswellwindow.h
# indra/newview/lltexturectrl.h
# indra/newview/lltoolbarview.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/llwearableitemslist.cpp
2024-02-21 13:07:42 +01:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
63151d5c6d
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/llurlentry.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llvoavatarself.h
2023-07-18 00:16:15 +02:00
4c89ad5586
SL-19306 A method of displaying user-customized keybindings in user-visible text
2023-07-17 15:46:18 +03:00
1d9d378a9b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-19 09:08:43 +01:00
49dd88e86c
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llviewerinput.cpp
2021-11-19 04:45:15 +02:00
603e04ee3c
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 13:18:55 +02:00
8178e51a74
SL-15690 FIXED Wrong URI determination
2021-07-29 19:06:13 +03:00
826ee26272
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-06-08 19:55:43 +02:00
b6ac642db2
SL-15243 Unicode URL validation
2021-06-03 19:50:08 +03:00
7458601374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 00:05:53 +01:00
609a26b59a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
...
# Conflicts:
# autobuild.xml (llca)
# indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
# indra/newview/llscenemonitor.cpp (SL-14422)
# indra/newview/llvovolume.cpp (SL-12069)
2021-02-01 22:28:15 +02:00
1461e9bbb0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-01-17 19:24:26 +01:00
52b3bb404c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-01-17 12:38:03 +01:00
5717f38411
FIRE-30611: "You" in transcript is underlined
2020-12-16 11:25:15 +01:00
240757c0d0
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-20 16:52:04 +02:00
ba04feea1f
SL-13618 FIXED uri's stuck showing "Loading..." in chat or dialog if more than one name is not cached.
2020-08-10 12:11:14 +03:00
98129be5ef
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-17 15:45:05 +02:00
9608b6dcac
SL-13433 Viewer should recognizes ipv6 links
2020-06-11 17:41:59 +03:00
0be6b40b25
FIRE-24262: Introduce an explicit label for "wear_folder" SLURLs to mitigate its abuse of trying to fool people into wearing the bunny default avatar
2019-08-14 22:39:17 +02:00
7e7984fcfd
Merge viewer-neko
2018-05-01 18:42:59 +02:00
bbbb8765fc
Merge viewer-bear
2017-02-16 19:24:15 +01:00
f8790210dd
MAINT-7103 New URI namespace /legacyname
2017-02-03 10:42:01 +02:00
cf9528018e
Add Firestorm help SLUrl
2016-11-29 19:09:43 +01:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
057bcc92ec
MAINT-8552 FIXED Secure map links do not parse in chat and SL icon is not displayed
2018-04-19 16:48:46 +03:00
f7e1774fcd
Try to re-allow URLs without protocol again...
2015-08-22 12:40:09 +02:00
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02:00
e62d5ea4e8
MAINT-5019 FIXED Undesired "http://" added to domains sent in chat
...
Completely removed matching of the URLs w/o a protocol
+ Some unit tests
2015-07-29 07:35:08 +03:00
078612e292
MAINT-5019 FIXED Additional cases
2015-07-14 04:39:20 +03:00
4ce6691cf8
Merge viewer-xp_tools
2015-06-25 11:57:17 +02:00
949942c730
merge changes for 3.7.29-release
2015-06-08 16:33:02 -04:00
a219cf1c98
Merge viewer-release
2015-04-15 15:07:13 -07:00
034fb74d05
merge changes for STORM-2113
2015-04-14 05:39:36 -04:00
5a282abe18
STORM-2113 - uri parsing cleanup and fixes
2015-04-11 15:23:06 -06:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
9be423524d
Merge LL V3.7.27
2015-04-14 22:08:31 +02:00
b5324afb6f
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2015-02-24 21:02:12 -05:00
f097c731d6
MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey part of the link always appears.
2015-03-04 13:10:58 +02:00
bf51454223
MAINT-4169 FIXED grey out all but domain name in SL-links, same as it's done for non-Linden URLs
2015-01-09 12:10:32 +02:00
027899963c
merge with 3.7.23-release
2014-12-19 23:20:47 +02:00
28e8b8ecdb
MAINT-4683 FIXED Display SLURLs with incorrect coordinates as regular URLs.
2014-12-04 12:40:13 +02:00
5711dc8fad
FIRE-11330: More changes to prevent names getting stuck if both name request via caps or legacy fail
...
Previous version could lead to a situation where a name request fails both via
caps or legacy, or it will return broken data, with both cases leading to a
callback connection waiting in the callback map and not issuing new requests for
the same name.
With the change, we might request names multiple times again, but handle the
callback only once (first one wins) and disconnect all others waiting, since
callObservers() will make sure all interested parties get notified about the
received name.
2015-04-01 15:39:36 +02:00
7f1f0019d8
Optimize previous fix:
...
We only need to request the name from the name cache once. In case a name has
to be resolved another time while the response to our first request hasn't
arrived yet, do not request it again but just add another observer for that
agent id - it will be called as well once the request is finished.
2015-03-31 13:50:57 +02:00
cd378552e1
FIRE-11330: Possible fix for MAINT-3118
2015-03-30 18:48:52 +02:00
6708f8d110
Merge fix #5 : Fix the BUG-8331 fail - removing protocol from the URL will make SLURL barf
2015-02-25 14:06:38 +01:00
Ansariel