4e0ad8a758
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/doxygen/CMakeLists.txt
# indra/llcommon/indra_constants.h
# indra/llmath/llmath.h
# indra/llmath/llvolume.cpp
# indra/llmath/v3dmath.h
# indra/llmath/v4color.h
# indra/llui/llchatentry.cpp
# indra/llui/llchatentry.h
# indra/llui/llfloater.h
# indra/llui/llkeywords.h
# indra/newview/llpanelprimmediacontrols.cpp
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotoptions.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewscript.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/de/panel_snapshot_options.xml
# indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/es/panel_snapshot_options.xml
# indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
# indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/it/panel_snapshot_options.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
# indra/newview/skins/default/xui/pl/panel_snapshot_options.xml
# indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
# indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
2025-04-18 19:56:20 +02:00
9c3ce3dec7
Clean up LLUI and fix/add suggestions from VS ( #2746 )
...
# Conflicts:
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowsdl.cpp
2025-04-18 01:45:11 +02:00
80f9aaa46e
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Audio.cmake
# indra/llui/llconsole.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llhudnametag.cpp
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llscripteditor.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerchat.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerparceloverlay.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvosurfacepatch.cpp
2024-08-05 20:10:02 +02:00
456d013ba8
Fix various issues with ui elements not updating colors dynamically
2024-08-04 23:11:57 -04:00
3d9414c1f2
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llfloaterreg.cpp
# indra/llui/llnotifications.cpp
# indra/llui/llpanel.cpp
# indra/llui/llui.cpp
# indra/llui/lluicolortable.cpp
# indra/llui/lluicolortable.h
# indra/newview/llappviewer.h
# indra/newview/llfloatersidepanelcontainer.cpp
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llpanelpeoplemenus.cpp
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2024-07-03 01:11:47 +02:00
14cbf331cb
Reduce string temporaries from LLTabContainer, LLMenuGL, LLLayoutStack, and LLKeywords using string_view
2024-07-02 08:56:42 -04:00
a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +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
3cd4077c73
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llkeywords.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llscripteditor.cpp
# indra/newview/llscripteditor.h
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/panel_script_ed.xml
2023-08-02 12:43:03 +02:00
62245de7ae
SL-19982 Adjustable font size in LSL editor
2023-08-01 20:14:27 +03:00
c306e7ad5c
Fix script editor ignoring font selection and make it actually use Source Code Pro font
2017-11-27 16:41:40 +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
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
e6b20328c2
A little more cleanup in LLSyntaxIDLSL and LLKeywords
2014-06-04 22:51:20 -06:00
8c970eae22
Remove orphaned LLKeywords methods
2014-05-16 09:18:38 -06:00
8501d6494b
Code policy
2014-05-07 19:58:56 -06:00
e8422e5bed
Let's get started: some code policy cleanup, reference arguments where we can, correct spelling
2014-05-06 11:09:50 -06:00
dcffb97518
Move some more script editor functions from LLTextEditor to LLScriptEditor
2014-04-18 23:13:57 -06:00
20a7d749cf
Orphaned definition
2014-04-16 11:52:46 -06:00
8bc4278412
strom-1831: Cleaning out commented and unused code
2014-03-28 17:21:36 +00:00
00a99d9097
Adding clear methods to remove any highlighting.
2014-02-06 16:47:27 +00:00
f6d86fcacf
Fixing some BOOL to bool and changing one function to void
2013-12-17 18:23:09 +00:00
fa5c3320cc
storm-1831 Cleaning up colour LLSD processing code which is no longer used as colours come from the colors XML file.
2013-11-21 19:55:38 +00:00
3e41917403
Removing no longer used member variable, adding method to reset the mLoaded status
2013-11-11 16:33:04 +00:00
0092455101
Removing unused getter/setter and property for mFilenameSyntax, mReady.
2013-11-10 22:35:49 +00:00
5e27952ee4
storm-1831 Switch to use the llsyntaxid keywords LLSD directly
2013-11-10 20:24:13 +00:00
29b2129e1e
Backed out changeset: e82d9467bec8
2013-11-09 11:32:08 +00:00
4af2158029
Adding method to load cached/default syntax file and method to access sKeyWordsXML.
2013-11-09 11:31:32 +00:00
79645e6981
STORM-1831 First attempt at using SyntaxIdLSL capability. (incomplete)
2013-10-21 04:09:20 +01:00
0ffaf25e75
STORM-1831 Removing unnecessary semi-colon
2013-10-15 21:46:24 +01:00
7d5ed4f747
Moving LSL highlighting colour info into .../skins/default/colors.xml where it makes more sense than its own xml file. Changing other functions to read it.
2013-06-27 21:28:52 +01:00
b615858d6c
Merging last four months of development
2013-06-26 17:39:23 +01:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
582babac2f
STORM-1831 Changes to LLSD structure and corresponding processing in llkeywords. Plus some formating clean ups.
2013-02-11 21:50:38 +00:00
7183cecd14
STORM-1831 merging in previous work
2013-02-05 16:37:37 +00:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
5b716795ab
More changes to keywords.ini:
...
* Don't read colors from the ini, use LLUIColorTable and let the users and skin artists choose colors
* Define more specific sections in the ini
* Standardize sections to only contain the section name, no readColor() hack!
* Expose color settings for syntax highlighting to the user
2013-05-16 13:28:12 -06:00
26b6dd4cf5
STORM-1677 FIXED Fixed gcc 4.5 build.
2011-11-01 16:04:07 +02:00
42c166e451
STORM-959 Adding syntax highlighting for /* */ style comments
2011-10-26 01:38:29 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
6bbe55558f
EXT-7623 FIX One more place where text was processed into segments without LLLineBreakSegment.
...
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/516/
--HG--
branch : product-engine
2010-06-07 12:56:29 +03:00
3e8320201f
Partial fix for EXT-5071.
...
Changed the index on the keyword map in LLKeywords so that LLKeywords::findSegments() doesn't have to create LLWString objects to search the map.
Reviewed by Richard.
2010-02-17 18:18:18 -08:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
2e32d44e71
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
...
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
d06e5e3519
svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640
...
Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-29 01:40:57 +00:00
Ansariel