Commit Graph

30353 Commits (54d392c4ff8a2a211e00a62023409b2dba85e8e9)

Author SHA1 Message Date
Cinder 54d392c4ff Another oops windows build fix. 2014-04-21 12:07:46 -06:00
Cinder 3dc1b32bf3 Windows build fix. 2014-04-21 09:33:21 -06:00
Cinder 1dad526a5c Reinstate support text appendText() in LLFloaterAbout 2014-04-18 23:25:21 -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 54c7b96bf1 Fix header guard 2014-04-18 22:03:05 -06:00
Cinder 9ec900c3c4 Trivial typo fix 2014-04-18 12:53:19 -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
Cinder 20a7d749cf Orphaned definition 2014-04-16 11:52:46 -06:00
Cinder 0039e80d7c bool not U32 2014-04-16 11:52:27 -06:00
Oz Linden 375c05ac43 merge changes for 3.7.5-release 2014-04-08 11:41:12 -04:00
Oz Linden a60875e549 merge latest changes from Ima 2014-04-08 11:40:10 -04:00
Oz Linden 7e966f28da increment viewer version to 3.7.6 2014-04-07 15:12:21 -04:00
Oz Linden 130e78d0a0 Added tag 3.7.5-release for changeset fc066b82343f 2014-04-07 15:12:21 -04:00
Ima Mechanique 08ca5279ff storm-1831: Fixing the remaining LL_ERRS. 2014-03-28 21:32:30 +00:00
Ima Mechanique 8bc4278412 strom-1831: Cleaning out commented and unused code 2014-03-28 17:21:36 +00: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
Aura Linden 1d15ac293b Double init of logging probably due to merge fail. 2014-03-26 05:26:10 -07:00
Aura Linden 9ea2694c0e Not ideal but sufficient. 2014-03-26 02:07:29 -07:00
Aura Linden 88b23a5153 Merged 2014-03-25 18:34:02 -07:00
Aura Linden 5b7929364b Still wasn't doing the right thing with log files. 2014-03-25 18:30:39 -07:00
Aura Linden 77432c1ed2 It would help to specify the correct destination directory genius. 2014-03-25 17:26:59 -07:00
Aura Linden fdb65d2c28 Fixed dumb mistake. 2014-03-25 14:05:51 -07:00
Aura Linden 0893b49ebd The simple approach has not worked. This hybrid solution should avoid the Windows issues and get us per-run logfiles. 2014-03-24 22:44:51 -07:00
Aura Linden 877f87a360 Old is the new new. 2014-03-24 15:19:03 -07:00
Aura Linden 77ec712b15 Merged in viewer-release. 2014-03-24 11:30:17 -07:00
Oz Linden 31a3a3da5d increment viewer version to 3.7.5 2014-03-24 14:20:14 -04:00
Oz Linden 0f9c05af1d Added tag 3.7.4-release for changeset d076568ff788 2014-03-24 14:16:45 -04:00
Oz Linden 6db0a2a7ea merge changes for DRTVWR-360 2014-03-24 14:15:56 -04:00
Aura Linden 103529e074 Pulled merge from release. 2014-03-24 09:59:53 -07:00
Aura Linden 489f265be2 Current log was actually correct. 2014-03-21 13:58:39 -07:00
Aura Linden 35ab71d8ea Returned Secondlife.log to main directory due to unforeseen LLErrorThread complexities. 2014-03-20 12:04:39 -07:00
Oz Linden bd4f4ee793 logging cleanup in support of debugging text editor problems 2014-03-19 14:17:13 -04:00
Merov Linden cb2bd57709 ACME-1376 : Take the location checkbox out of the photo panel 2014-03-17 14:59:49 -07:00
Monty Brandenberg 0bc8e67ebb Mac Debug build is functional with this manifest change 2014-03-15 18:18:58 -04:00
Monty Brandenberg 1e764fb668 Consistent set of fmodex 4.44.31 builds now. 2014-03-14 21:14:32 -04:00
Monty Brandenberg c62d2cca29 Additions & fixes for lib copy, use only forwarded ptrs in LLAE interfaces.
Copy3rdPartyLibs needed to copy the now-corrected fmodexL libraries
and it had a bad library reference on Linux for release.  In
llaudio land, the audio engine interfaces, even the fmodex
specializations, seem to want to be external-structure free
so use a forward declaration and pointer to FMOD_DSP_DESCRIPTION
and deal with it in the ctor/dtor.
2014-03-14 20:58:35 -04:00
Monty Brandenberg 4f565ed077 Update fmodex to 4.44.31. Move DSP descriptor to heap storage. 2014-03-14 19:48:35 -04:00
Oz Linden d6fdc6e68f merge changes for 3.7.3-release 2014-03-14 16:38:12 -04:00
Oz Linden bc7a579ba2 STORM-1831 initialize LLKeywords::mLoaded in constructor (fixes black-on-black text in various places) 2014-03-14 16:33:47 -04:00
Oz Linden 3ee3d4a8f4 correct logging levels (ERR causes a crash), and a minor style fix 2014-03-14 16:19:21 -04:00
Aura Linden 8d5b933ad0 Probable fix for linux hang. 2014-03-13 23:33:12 +00:00
Aura Linden 706ec08deb Merged in viewer-release 2014-03-13 21:55:22 +00:00
Monty Brandenberg 9c29000ba2 Merge. Refresh from viewer-release after 3.7.3 release. 2014-03-10 20:34:43 -04:00
Oz Linden cb91708332 increment viewer version to 3.7.4 2014-03-10 14:33:54 -04:00
Oz Linden d1e1a2a7d3 Added tag 3.7.3-release for changeset 962d3f98955b 2014-03-10 14:33:54 -04:00
Monty Brandenberg 71e237a3f7 MAINT-3703 Suspected thread race crasher in fmodex library
Two problems found in DLL involving threads.  First, DllMain
was reinitializing a critical section for all entry reasons
(process attach, detach and thread attach, detach).  Should
only be done on process attach.  Second, static container
object was being modified and accessed without serialization.
Added some double-check locking to the initialization path
to reduce the total number of serialization calls made while
making the code thread safe.
2014-03-10 12:16:49 -04:00
Ima Mechanique 06bdcef531 storm-1831 Fixing identificaton of label for highlighting. 2014-03-09 04:55:46 +00:00
Aura Linden d2bb4dae98 Fixes for crash reporter startup race condition, crash reporter CPU use, Secondlife.log filehandle, XP Crash. 2014-03-07 14:58:22 -08:00
Ima Mechanique a2c084849f storm-1831: Fixing constants not getting highlighted. Fixing ratation constant treated as string. Adding logging of unrecognised token groups. 2014-03-06 16:11:59 +00:00