4ce6691cf8
Merge viewer-xp_tools
2015-06-25 11:57:17 +02:00
949942c730
merge changes for 3.7.29-release
2015-06-08 16:33:02 -04:00
a219cf1c98
Merge viewer-release
2015-04-15 15:07:13 -07:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
223f02e0ad
Missing 2 lines of code from previous commit, credit to Sei
2015-06-10 02:06:00 -07:00
5ed42dd308
FIRE-16259: Fix "Editior" misspelling
2015-06-02 13:31:06 +02:00
3074538b99
FSScriptEditiorRecompileButton: added option for save/recompile button with preproc
2015-05-24 02:25:36 -07:00
215c0dcb27
Clean up whitespaces and remove unnecessary checks
2015-05-22 00:37:53 +02:00
761b8007b6
Added a simple compile status indicator to script editor
2015-05-21 00:39:39 -07:00
de69b11387
Merge.
2015-05-07 23:22:44 +02:00
88b16e8d5d
FIRE-16042: Restore warning when toggling LSL preprocessor; Patch by Sei Lisa, slightly changed to get rid of the static callback
2015-05-06 15:05:06 +02:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
dba72bf063
Move clearing functions combobox where Cinder moved it in STORM-2115 so we will not end up with a dupe
2015-05-04 00:34:23 +02:00
cec7691ef0
Merge changes from main repo
2015-04-22 21:16:17 +02:00
b0ca32a3e6
FIRE-15906: Clear combobox values before adding new
2015-04-20 16:23:33 +02:00
9be423524d
Merge LL V3.7.27
2015-04-14 22:08:31 +02:00
a6fb602cb8
Backed out changeset 8516c262d1df (FIRE-511 / VWR-27512) to make room for LL fix
2015-04-14 19:22:32 +02:00
cd08c3f360
Fix some crashyness from FIRE-15524.
2015-04-10 00:07:38 +02:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
027899963c
merge with 3.7.23-release
2014-12-19 23:20:47 +02:00
811878df66
MAINT-202 FIXED Can't open scripts in copied objects individually on the viewer2
2014-11-05 17:52:14 +02:00
ffbefc2749
FIRE-10172: Fix LSL script editor error handling - by Sei Lisa; with slight modifications to meet our coding guidelines and let the comment textbox scroll to the end automatically
2015-03-17 13:47:50 +01:00
0fe86a30bc
Replace magic number with correct way to retrieve the value
2015-01-23 11:09:19 +01:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
eb19075c39
Transfer everything from old FS script editor prefs to new script editor preferences from V3 and remove old FS script editor prefs
2015-01-12 15:44:59 +01:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
577a3973ea
Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-10-20 14:00:39 -07:00
f9113c286f
Merge
2014-10-09 16:10:00 -07:00
da639d1c98
Show experiences with blank names as (untitled experience) in experience search, script editor, and allowed/trusted/blocked lists for ACME-1585
2014-08-21 19:43:50 +01:00
d071aeb6f1
merge
2014-08-20 01:11:55 +01:00
5b82645ba2
Added tooltip to > button in script editor for ACME-1588
2014-08-20 00:33:23 +01:00
81c342dfa9
Merge with 3.7.13-release
2014-08-06 09:22:43 -07:00
487fce4afa
Merge with 3.7.11-release
2014-07-09 15:22:12 -07:00
01ad2bcd04
MAINT-4238 FIXED Accept new types of tokens/delimiters as well as TT_WORD
2014-07-23 11:34:55 +03:00
3e6698073c
Merge viewer-release and become version 3.7.12
2014-07-07 14:49:45 -07:00
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
200788c344
Updated all experience responders for LLCurl::Responder interface changes for ACME-1535 and ACME-1536
2014-06-24 22:43:23 +01:00
a9c281eb57
Updated ExperienceResponder in llpreviewscript.cpp to use new LLCurl::Responder interface for ACME-1534
2014-06-24 03:47:03 +01: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
8a45e1915d
ACME-1495: Fxied merge
2014-05-27 15:43:17 -07:00
0481494c2d
Merge with 3.7.8-release
2014-05-20 10:03:09 -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
48fece4473
Merge with 3.7.7-release
2014-05-07 11:14:26 -07:00
Ansariel