Commit Graph

240 Commits (a45088cb6b94a8d7f64a47b1a3fef1c95bcea607)

Author SHA1 Message Date
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01:00
Ansariel e1ce6e3d58 Merge Firestorm LGPL tip 2015-01-08 23:12:58 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Oz Linden e15002a11c merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
Cinder 79e0e7d298 Merge upstream 2014-06-07 14:14:29 -06:00
Ricky Curtice 98720c3cec Merge 2014-06-05 06:31:30 -07:00
Stinson Linden babd89b770 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2014-05-19 22:19:55 +01:00
Cinder e776b600b1 Refactor more script editor properties away from LLTextEditor to LLScriptEditor 2014-05-14 14:08:24 -06:00
Oz Linden 1e851a2eb7 correct bad merges from 3.7.7-release 2014-05-07 15:18:44 -04:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Stinson Linden 001621dfc2 MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null. 2014-05-05 23:24:34 +01: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
Ansariel 6845d6ac31 FIRE-11045: Spell checking changes on an unmodified notecard are not identified as such 2014-09-02 13:51:42 +02:00
Ansariel f166eed059 Update Search & Replace floater to latest version from Kitty Barnett (Catznip viewer) 2014-09-02 12:17:52 +02:00
Oz Linden d6fdc6e68f merge changes for 3.7.3-release 2014-03-14 16:38:12 -04:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Tank_Master 3d1ac7c0ec Merge LL 3.7.3 (Viewer-Bear fixes) 2014-03-17 14:14:15 -07:00
maksymsproductengine faa17c76c9 MAINT-3610 FIXED SL viewer partly 'eats' chat-messages 2014-03-06 05:51:49 +02:00
Ansariel 00bfbfae2b Tag Firestorm-specific code in last commit 2014-10-28 22:39:16 +01:00
Lirusaito caa86284e1 Ctrl-Backspace and Ctrl-Delete for removing whole words when editing text 2014-08-27 00:04:47 -04:00
Ima Mechanique 00a99d9097 Adding clear methods to remove any highlighting. 2014-02-06 16:47:27 +00:00
simon 52ce788d0c Pull in viewer-lion to lock down next release 2014-02-18 16:41:21 -08:00
Baker Linden d7b902d575 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
Kitty Barnett 69f7092346 Can't click on a link if there's an active selection in the text editor 2014-02-04 19:43:49 +01:00
maxim@mnikolenko 74c7460846 MAINT-3618 FIXED Don't copy spaces after cursor to the next line. 2014-01-20 12:48:58 +02:00
Oz Linden 7f39d0472e merge changes for STORM-1831 2013-11-18 13:51:24 -05:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Ima Mechanique dc317ed70a Refactoring load routines to remove uneeded methods 2013-11-10 21:58:17 +00:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Ima Mechanique 0c1d6d7d9e Merge v3.6.7 in 2013-10-04 20:47:54 +01:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
Oz Linden 82bf4e4db2 merge changes for DRTVWR-285 2013-08-19 15:15:15 -04:00
MaximB ProductEngine b7fbcef298 MAINT-3289 (User is not able to open mini inspector by one click on 'i' icon) 2013-10-11 23:06:25 +03:00
MaximB ProductEngine 3e934d5089 MAINT-3151 (Issue with urls being autoclicked when holding left click into an unfocused textbox then dragging pointer over a url and releasing.) 2013-09-23 09:14:53 +03:00
Mnikolenko ProductEngine 8fa463113c MAINT-3119 FIXED Select auto-completed part using cursor position 2013-09-17 12:20:28 +03:00
MaximB ProductEngine b0a873570e MAINT-3289 (User is not able to open mini inspector by one click on 'i' icon) 2013-10-11 22:45:12 +03:00
Baker Linden a72e34a345 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden 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
Ima Mechanique 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
Ima Mechanique b615858d6c Merging last four months of development 2013-06-26 17:39:23 +01:00
maksymsproductengine 90a3285e26 CHUI-941 [CHUIBUG]Inline input is not available in 3.5.0 2013-05-31 20:05:12 +03:00
Merov Linden 51fab4d45c Pull merge from viewer-release 2013-05-22 13:59:53 -07:00
Merov Linden 2113bb8159 Pull merge from viewer-release 2013-05-22 11:23:51 -07:00
maksymsproductengine c6d4e449e4 CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0 2013-05-22 16:35:08 +03:00