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
8c16ec2b53
Convert BOOL to bool in LLControlGroup and related classes
2024-02-21 03:00:25 +02:00
7ab897baf0
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-16 23:05:40 +02:00
94ce45441d
SL-15082 regexp fix
2021-04-10 01:38:17 +03:00
98129be5ef
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-17 15:45:05 +02:00
905005be3c
SL-13433 Add tests for new url entry
2020-06-11 20:54:09 +03:00
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
5591515f19
MAC build fix
2019-10-23 20:27:05 +03:00
1d94fc7ce6
Change function signature of getAnonym to return std::string rather than reference and do not return "nobody" in case RLVa is disabled.
2019-10-09 22:32:19 +02:00
e19d7a7490
Merge with viewer64.
2017-02-14 19:49:51 +01:00
37974a2fa2
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2017-02-03 20:14:32 -05:00
ead15a8ff5
DRTVWR-418: Remove most (all?) of the "stubs" from llurlentry_test.
...
At some point the INTEGRATION_TEST_llurlentry build changed so that the
library(ies) we attempted to stub out got linked in anyway, so that instead of
simplifying the test, the stubs broke it with "duplicate symbol" errors.
Commenting out the stubs permits the test program to succeed.
2017-02-03 16:46:46 -05:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
c92eb7e591
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-08-30 11:36:06 -04: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
6b0da7af72
Merge.
2016-01-17 01:05:13 +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
40699b9663
MAINT-5498 LLUrlEntry regex refactoring
...
Improved LLUrlEntryHTTP, extended a test
2015-12-15 01:17:26 +02: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
68739bc569
Merge Viewer-Bear
2015-10-27 01:31:15 +01:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
52d30bbbe9
MAINT-5464 FIXED Do not add badge to links that have a port number specified.
2015-10-23 07:52:43 +03:00
53b947e039
Merge from viewer release.
2015-10-19 12:03:08 -07:00
f0d9118173
One of the tests defined a namespace in order to fake out the libraries. Removed it.
2015-09-01 17:03:08 -07:00
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02:00
62527e6f18
MAINT-5506: Fix ugly timing bug in llurlentry static initialization.
...
The problem was that class-static LLUrlEntryParcel::sRegionHost was being
initialized by copying class-static LLHost::invalid. Naturally, these two
statics are initialized in different source files. Since C++ makes no promises
about the relative order in which objects in different object files are
initialized, it seems we hit a case in which we were trying to initialize
sRegionHost by copying a completely uninitialized LLHost::invalid.
In general we might attempt to address such cross-translation-unit issues by
introducing an LLSingleton. But in this particular case, the punch line is
that LLHost::invalid is explicitly constructed identically to a
default-constructed LLHost! In other words, LLHost::invalid provides nothing
we couldn't get from LLHost(). All it gives us is an opportunity for glitches
such as the above.
Remove LLHost::invalid and all references, replacing with LLHost().
2015-08-18 17:05:29 -04: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
62c748936c
MAINT-5019: Buildfix - added a tests for emails, improved handling of URLs starting with www.
2015-07-15 23:58:56 +03:00
77da469d6f
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2015-06-30 14:50:37 -04:00
4ce6691cf8
Merge viewer-xp_tools
2015-06-25 11:57:17 +02:00
4302637464
MAINT-5232: Make gMessageSystem an LLPounceable<LLMessageSystem*>.
...
This will permit other subsystems to use gMessageSystem.callWhenReady() to (e.g.)
register callbacks as soon as gMessageSystem is fully initialized.
2015-05-23 12:41:47 -04:00
a219cf1c98
Merge viewer-release
2015-04-15 15:07:13 -07:00
9be423524d
Merge LL V3.7.27
2015-04-14 22:08:31 +02:00
c8cfcf8ea1
Fix build issues.
2014-10-16 17:27:44 +03:00
d15a709cd7
Fixed unit test
2014-03-21 10:22:50 -07:00
977ee4cd6d
Added stubs for llurlentry_test.cpp
2013-09-24 23:25:29 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Ansariel