bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
3e6698073c
Merge viewer-release and become version 3.7.12
2014-07-07 14:49:45 -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
98720c3cec
Merge
2014-06-05 06:31:30 -07: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
059a29e976
Fix callback signal, Eliminate some unnecessary statics
2014-05-11 23:17:31 -06:00
a354d0efb3
Merge up.
2014-05-07 19:59:41 -06:00
8501d6494b
Code policy
2014-05-07 19:58:56 -06:00
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07: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
dcffb97518
Move some more script editor functions from LLTextEditor to LLScriptEditor
2014-04-18 23:13:57 -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
5705a2c018
MAINT-3671 Fix is changed to solve issue with other multi-previews
2014-02-25 17:06:06 +02:00
4514d8c5c3
Refactoring to better check state of loading and to allow clearing of highlighting if we don't have a valid keywords file.
2014-02-06 16:48:22 +00:00
294d6777bf
MAINT-3671 FIXED Rename title when new tab is added.
2014-02-03 11:53:39 +02:00
4bcb67c704
Making initialisation of mKeywords conditional on mSyntaxIdLSL having loaded an XML file.
2014-01-30 13:01:19 +00:00
da4ef42142
MAINT-3643 FIXED Copy previous search / replace strings in LSL editor
2014-01-28 12:20:41 +02:00
fd643f07c8
storm-1831 In the LLSD, functions are in a <map> which makes sorting unnecessary (loading sorts them).
2014-01-04 01:27:57 +00:00
ab71e294e0
MAINT-3570 FIXED Callbacks for menu item are added.
2013-12-26 12:34:50 +02:00
7563fb0b51
storm-1831 Replacing old hack with an ENUM check.
2013-11-22 01:01:29 +00:00
25c7ea0532
storm-1831 Replacing old region changed callback setup with the shiny new one.
2013-11-21 00:02:15 +00:00
df78262f0a
Fixing the stupid mistake that prevented this from compiling. Thanks to Jonathan Yap for spotting it.
2013-11-15 23:17:06 +00:00
377eb5561f
Renaming initKeywords to better reflect its intended use (onRegionChangeInitialiseKeywords)
2013-11-11 16:34:16 +00:00
f6d8e55eb9
Fixing indentation of LLScriptEdCore::initKeywords
2013-11-11 13:36:33 +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
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
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
0c1d6d7d9e
Merge v3.6.7 in
2013-10-04 20:47:54 +01:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -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
b615858d6c
Merging last four months of development
2013-06-26 17:39:23 +01:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
6f2fef886e
merge changes for storm-1911
2013-03-25 10:53:37 -04:00
f07b9c2c69
renamed LLTrace stat gathering classes/methods to make the structure of LLTrace clearer
...
Count becomes CountStatHandle
Count.sum becomes sum(Count, value), etc.
2013-03-06 11:08:25 -08:00
simon