Commit Graph

175 Commits (9f2302bdffde0c82a0cfab730a250aaee9b7059c)

Author SHA1 Message Date
Oz Linden 949942c730 merge changes for 3.7.29-release 2015-06-08 16:33:02 -04:00
simon a219cf1c98 Merge viewer-release 2015-04-15 15:07:13 -07:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
maksymsproductengine 027899963c merge with 3.7.23-release 2014-12-19 23:20:47 +02:00
andreykproductengine 811878df66 MAINT-202 FIXED Can't open scripts in copied objects individually on the viewer2 2014-11-05 17:52:14 +02:00
callum_linden 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
dolphin f9113c286f Merge 2014-10-09 16:10:00 -07:00
Cho 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
Cho d071aeb6f1 merge 2014-08-20 01:11:55 +01:00
Cho 5b82645ba2 Added tooltip to > button in script editor for ACME-1588 2014-08-20 00:33:23 +01:00
dolphin 81c342dfa9 Merge with 3.7.13-release 2014-08-06 09:22:43 -07:00
dolphin 487fce4afa Merge with 3.7.11-release 2014-07-09 15:22:12 -07:00
Mnikolenko ProductEngine 01ad2bcd04 MAINT-4238 FIXED Accept new types of tokens/delimiters as well as TT_WORD 2014-07-23 11:34:55 +03:00
simon 3e6698073c Merge viewer-release and become version 3.7.12 2014-07-07 14:49:45 -07:00
simon bfa42c9e28 Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
Cho 200788c344 Updated all experience responders for LLCurl::Responder interface changes for ACME-1535 and ACME-1536 2014-06-24 22:43:23 +01:00
Cho a9c281eb57 Updated ExperienceResponder in llpreviewscript.cpp to use new LLCurl::Responder interface for ACME-1534 2014-06-24 03:47:03 +01:00
Cinder 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
Ricky Curtice 98720c3cec Merge 2014-06-05 06:31:30 -07:00
dolphin 8a45e1915d ACME-1495: Fxied merge 2014-05-27 15:43:17 -07:00
dolphin 0481494c2d Merge with 3.7.8-release 2014-05-20 10:03:09 -07:00
Cinder 70aff2154b Eliminate updateKeywords() 2014-05-12 07:23:52 -06:00
Cinder 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
Cinder 059a29e976 Fix callback signal, Eliminate some unnecessary statics 2014-05-11 23:17:31 -06:00
Cinder a354d0efb3 Merge up. 2014-05-07 19:59:41 -06:00
Cinder 8501d6494b Code policy 2014-05-07 19:58:56 -06:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
dolphin 48fece4473 Merge with 3.7.7-release 2014-05-07 11:14:26 -07:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Cinder e8422e5bed Let's get started: some code policy cleanup, reference arguments where we can, correct spelling 2014-05-06 11:09:50 -06:00
Cinder 46627b4eb2 Remove clearHighlights() 2014-04-18 23:20:33 -06:00
Cinder dcffb97518 Move some more script editor functions from LLTextEditor to LLScriptEditor 2014-04-18 23:13:57 -06:00
Cinder 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
Ima Mechanique 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
Mnikolenko ProductEngine bb0515db31 MAINT-3852 FIXED Use script name in "Save as" dialog. 2014-03-25 11:37:19 +02:00
dolphin 74dcc04e69 Updated experience cache to get a const reference to xp data 2014-03-17 15:57:15 -07:00
dolphin 7b9817cbcc Fixed a bug that lost callbacks if > 10 experiences were looked up at a time. 2014-03-10 10:15:19 -07:00
Ima Mechanique 06bdcef531 storm-1831 Fixing identificaton of label for highlighting. 2014-03-09 04:55:46 +00:00
Ima Mechanique 76aa75974f storm-1831 Changes in postBuild to use onFileFetchedCallback 2014-03-06 13:24:52 +00:00
Mnikolenko ProductEngine 5705a2c018 MAINT-3671 Fix is changed to solve issue with other multi-previews 2014-02-25 17:06:06 +02:00
Ima Mechanique 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
Mnikolenko ProductEngine 294d6777bf MAINT-3671 FIXED Rename title when new tab is added. 2014-02-03 11:53:39 +02:00
Ima Mechanique 4bcb67c704 Making initialisation of mKeywords conditional on mSyntaxIdLSL having loaded an XML file. 2014-01-30 13:01:19 +00:00
maxim@mnikolenko da4ef42142 MAINT-3643 FIXED Copy previous search / replace strings in LSL editor 2014-01-28 12:20:41 +02:00
Ima Mechanique 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
Mnikolenko ProductEngine ab71e294e0 MAINT-3570 FIXED Callbacks for menu item are added. 2013-12-26 12:34:50 +02:00
Ima Mechanique 7563fb0b51 storm-1831 Replacing old hack with an ENUM check. 2013-11-22 01:01:29 +00:00