Commit Graph

57 Commits (5c03f284af4eeebe3ee26e8f69b1edc4570dd862)

Author SHA1 Message Date
Ansariel 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
Andrey Lihatskiy 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
Ansariel 8c16ec2b53 Convert BOOL to bool in LLControlGroup and related classes 2024-02-21 03:00:25 +02:00
Mnikolenko Productengine 94ce45441d SL-15082 regexp fix 2021-04-10 01:38:17 +03:00
Mnikolenko Productengine 905005be3c SL-13433 Add tests for new url entry 2020-06-11 20:54:09 +03:00
andreykproductengine 5591515f19 MAC build fix 2019-10-23 20:27:05 +03:00
Nat Goodspeed 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
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Rider Linden b8c1976460 Merge 2016-03-17 13:14:21 -07:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Rider Linden e7eaa94dfa Merge VR 2016-01-15 13:36:38 -08:00
AndreyL ProductEngine 40699b9663 MAINT-5498 LLUrlEntry regex refactoring
Improved LLUrlEntryHTTP, extended a test
2015-12-15 01:17:26 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
AndreyL ProductEngine 52d30bbbe9 MAINT-5464 FIXED Do not add badge to links that have a port number specified. 2015-10-23 07:52:43 +03:00
Rider Linden 53b947e039 Merge from viewer release. 2015-10-19 12:03:08 -07:00
Rider Linden 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
AndreyL ProductEngine 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
AndreyL ProductEngine 62c748936c MAINT-5019: Buildfix - added a tests for emails, improved handling of URLs starting with www. 2015-07-15 23:58:56 +03:00
dolphin d15a709cd7 Fixed unit test 2014-03-21 10:22:50 -07:00
dolphin 977ee4cd6d Added stubs for llurlentry_test.cpp 2013-09-24 23:25:29 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep e42e9f897c Fixed unit test compile error 2013-03-13 15:01:27 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Don Kjer cf7eb79fa7 Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender. 2012-09-08 04:39:11 +00:00
Richard Linden 057da807ac removed LLXUIXML library
moved LLInitParam, and LLRegistry to llcommon
moved LLUIColor, LLTrans, and LLXUIParser to llui
reviewed by Nat
2012-01-20 13:51:46 -08:00
Richard Nelson e61569d714 added compound LLSD parsing to param blocks
reviewed by Leslie
2011-10-10 14:08:14 -07:00
Richard Linden 1dedd3de05 EXP-648 FIX As a developer, I want to be able to specify param blocks that use Multiple<LLUIImage> for a sequence of images
Factored out param block data classes so that specialized param block types, such as LLUIImage, LLFontGL, LLRect, etc. can be stored in a Multiple<T> context
Converted loading_indicator to take image sequence from XUI
deprecated name-value pairs for LLUIColor values, and put them in colors.xml
2011-04-19 16:16:54 -07:00
Vadim ProductEngine 3b97a200b8 STORM-796 ADDITIONAL_FIX Fixed Mac build. 2010-12-18 18:35:32 +02:00
Vadim ProductEngine abda07fb77 STORM-796 FIXED Implemented rendering /app/region/ SLapps into human-readable strings.
Example: secondlife:///app/region/Ahern/10/20/30/ is displayed as "Ahern (10,20,30)".
2010-12-16 20:22:32 +02:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00
callum f5b3fc596d Add support for debug setting to disable link highlight & follow in URLs that appear in XUI widgets 2010-10-06 15:34:32 -07:00
Aimee Linden 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
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
James Cook 779e199c29 Fix mac build for llurlentry_test.cpp 2010-05-26 09:30:31 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden 13d4257868 automated merge 2010-02-26 12:02:34 -08:00
Roxie Linden 5c73a90835 automated merge 2010-02-25 21:20:45 -08:00
Roxie Linden 0bf246ed66 Automated merge 2010-02-25 00:17:42 -08:00
Lynx Linden e563a07659 DEV-32540: Lots of object IM and SLurl improvements
- Don't let object names that are URLs override links to display the
  remote object inspector

- Don't hyperlink the object name in the remote object inspector

- Made the <nolink>...</nolink> regex more robust and made it support
  non-URLs between the tags, so that we don't get random <nolink> tags
  when trying to disable URLs in user-typed text.

- Improved the llurlentry unit test and added some more test cases.

- Hooked up another LLViewerMessage code path to objectim SLapps to
  pass down the owner and slurl information.

- Made a few LLUrlEntryBase methods be const methods, because they are

- Fixed a bug in the remote object inspector where it would never show
  the teleport URL.
2010-02-02 17:19:14 +00:00
Tofu Linden ccbf6088b7 CID-299
Checker: UNINIT_CTOR
Function: LLUIColor::LLUIColor()
File: /indra/llui/tests/llurlentry_test.cpp
2010-01-29 15:54:24 -08:00
Lynx Linden 4d6c9e3e17 EXT-4678: Support <nolink>...</nolink> to turn off URL hyperlinking.
We are running into a bunch of places where we don't want to allow
hyperlinking of URLs like secondlife.com in text boxes. I've therefore
added a new type of URL regex that disables URL hyperlinking. Simply
enclose the URL in a <nolink> tag, e.g.:

  <nolink>secondlife.com</nolink>
2010-01-29 14:30:26 +00:00
Lynx Linden c6108f0fad EXT-4125: Regexes hurt my head!
Updated the regex to match a free URL in plain text with no http:
protocol. This now explicitly does not match e-mail addresses, such as
test@lindenlab.com (yay negative lookbehind regexes). It additionally
matches URLs with a port or path after it, e.g., secondlife.com/status.

I've added a bunch more unit tests to asset positive and negative
matches for this regex, because no human can do this in their head.
2010-01-15 11:07:37 +00:00
Lynx Linden 1d9591afbe DEV-44732: Added some unit tests for URLs with no protocols. 2010-01-11 12:05:39 +00:00
James Cook a4c657a49d Group inspectors now work. They are hooked up to About Land, build tools floater, and anywhere secondlife:///app/group URLs appear. Reviewed with Leyla. 2009-10-16 23:20:05 +00:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
Martin Reddy 47abd55908 EXT-944 EXT-1026: reverting my previous fix for these crashes.
This didn't work on Windows because wchar_t is 2 bytes on that
platform, not 4 bytes (whereas llwchar is 4 bytes everywhere).
Boost's regex methods need to work on wchar_t, but I believe
that using a UTF-16 string would still be prone to crashing on
Windows as UTF-16 is still a variable-length encoding. Besides,
trying to compile a UTF-16 solution generates weird link errors.

Instead, I'm going to fix this problem a different way. And
I'm starting by reverting the previous attempt. Thanks Win32.
2009-09-23 13:57:06 +00:00