bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
41f6c5ce48
Greatly simplify LLSyntaxIdLSL:
...
* Move file fetched callback to the singleton and handle all syntax id changes within the singleton
* Remove a fair number of bool checks and method relying more on callbacks to drive syntax changes.
* Don't pretty print the cache file to conserve space and to speed up xml to llsd parsing
* Clean up includes
2014-06-09 15:14:09 -06:00
70aff2154b
Eliminate updateKeywords()
2014-05-12 07:23:52 -06:00
6141aa44d0
STORM-2027 - Fix syntax highlighting on subsequent opening of scripts.
...
This could use more refactoring, but it fixes it.
2014-05-12 06:54:04 -06:00
a354d0efb3
Merge up.
2014-05-07 19:59:41 -06:00
8501d6494b
Code policy
2014-05-07 19:58:56 -06:00
a5568f942b
Merge downstream version 3.7.8 code
2014-05-07 15:28:13 -07:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04: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
46627b4eb2
Remove clearHighlights()
2014-04-18 23:20:33 -06:00
8c39617c9a
Begin moving script editor portions of LLTextEditor to their own derived class.
...
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor
TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
2014-04-18 12:52:07 -06:00
8e53c5bfb0
storm-1831 Removing the callback after first region crossing. Prevents repeated callbacks after highlighting has been removed for live script.
2014-03-26 20:31:05 +00:00
bb0515db31
MAINT-3852 FIXED Use script name in "Save as" dialog.
2014-03-25 11:37:19 +02:00
06bdcef531
storm-1831 Fixing identificaton of label for highlighting.
2014-03-09 04:55:46 +00:00
76aa75974f
storm-1831 Changes in postBuild to use onFileFetchedCallback
2014-03-06 13:24:52 +00:00
377eb5561f
Renaming initKeywords to better reflect its intended use (onRegionChangeInitialiseKeywords)
2013-11-11 16:34:16 +00:00
1cf2acf6d7
Fixing some small discrepencies.
2013-11-10 22:47:34 +00:00
488964157c
Moving keywords code into its own method.
2013-11-10 21:57:29 +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
bad5179f27
storm-1831 Fixing viewer crash and clean up. No idea why storing the region pointer in mRegion causes crashes, when doing it locally in each method doesn't.
2013-10-25 14:42:04 +01:00
79645e6981
STORM-1831 First attempt at using SyntaxIdLSL capability. (incomplete)
2013-10-21 04:09:20 +01:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
9f393c1d99
merge up to latest snowstorm integration branch
2013-07-24 14:40:23 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
005cd40247
STORM-1911: Go-to line function for the internal LSL script editor
2012-09-19 00:49:34 +02:00
eeefec394c
Changes to filter out tabs from file load and to test if loading/saving should be allowed.
2011-11-23 01:30:15 +00:00
b28492fbff
STORM-1708 Adding ability to save/load scripts from file.
2011-11-17 23:17:26 +00:00
0eb491417e
STORM-806 FIXED Enabled external editor for inventory scripts.
...
Changes:
* Moved external editor handling to LLScriptEdCore which is shared between
LLLiveLSLEditor (object script editor) and LLPreviewLSL (inventory script editor).
* The Edit button is now only enabled when appropriate.
2010-12-22 21:48:42 +02:00
b2fcba25c8
STORM-52 FIXED Made it possible to use an external script editor.
...
The editor can be specified:
* via "ExternalEditor" setting in settings.xml
* via LL_SCRIPT_EDITOR variable
Removed obsolete XUIEditor setting in favor of the new one.
2010-11-13 00:53:29 +02:00
f3b01596dd
VWR-21377 Script editor ctrl-f fix.
...
change to better / more consistent naming
2010-09-24 16:31:43 -07:00
0931799f03
VWR-21377 Script editor ctrl-f fix.
...
let some LLViews handle shortcut keys if they want.
reviewed with ambroff
2010-09-24 15:57:17 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
256b8aba31
Fixed some more header file usage after the recent rebasing of my old precompiled header work.
2009-12-02 20:20:12 -08:00
acdce23299
Header file cleanup
...
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.
--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
feabeb4965
DEV-35039 Viewer 2.0 Help System - Viewer Development
...
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
2009-09-30 17:46:31 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +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
667ca55bad
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2009-01-05 18:59:12 +00:00
b406972af1
svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporating:
...
QAR-892 Windows installer that pings secondlife.com on launch
QAR-837 Six New Languages in the Installer
QAR-908 downloader-support-1 merge
2008-10-28 23:56:20 +00:00
9a7d68cfce
svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-07-31 12:15:15 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +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
facf67ae32
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
...
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
13c391f198
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
...
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
2007-09-14 21:13:20 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
simon