Commit Graph

169 Commits (bfe520387ed3061ba55ea2e58c565016e7a3159e)

Author SHA1 Message Date
Merov Linden 1e32b9dd33 Pull merge of lindenlab/viewer-release 2013-10-04 09:47:26 -07:00
simon 71e2efab16 Merge downstream code - Vivox release 2013-08-05 14:50:40 -07:00
Merov Linden 74e3fb7b33 Pull merge from lindenlab/viewer-release 2013-08-05 12:14:48 -07:00
Merov Linden bdd8005721 ACME-755 : Fix erasing in live std::map (breaks build on Mac and Linux). 2013-07-29 12:09:29 -07:00
Gilbert Gonzales 7b56020d66 ACME-755 Clear FB cookies by removing cookies from the .facebook.com domain 2013-07-26 18:49:31 -07:00
Aura Linden ce9962b338 Merged in viewer-release 2013-07-11 17:49:13 -07:00
Aura Linden 8642f57dd9 Removed debugging. 2013-05-16 10:31:33 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
simon 291b387178 Cmake doesn't like me 2013-05-02 15:36:26 -07:00
simon 299433c544 Fix the cmake fix 2013-05-02 15:13:05 -07:00
simon 104f576400 Fix Windows Debug build 2013-04-23 16:27:24 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Don Kjer 54cdc322b8 Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam. 2013-03-05 22:05:22 -08:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Aura Linden 2282d6b11a Fixed whitespace issues for merge. 2012-12-13 12:24:17 -08:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
Aura Linden eca6199852 Ported slplugin and some other missing components for cocoa. 2012-11-12 18:06:32 -08:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
Nat Goodspeed 166f75d91f MAINT-1144: Defend against NULL LLPluginProcessParent::mProcess.
The change from LLProcessLauncher to LLProcess introduces the possibility of a
NULL (default-constructed) LLProcessPtr. Add certain static LLProcess methods
accepting LLProcessPtr, forwarding to nonstatic method when non-NULL but doing
something reasonable with NULL. Use these methods in LLPLuginProcessParent.
2012-06-06 16:38:16 -04:00
Nat Goodspeed 47d9475707 Convert LLProcess consumers from LLSD to LLProcess::Params block.
Using a Params block gives compile-time checking against attribute typos. One
might inadvertently set myLLSD["autofill"] = false and only discover it when
things behave strangely at runtime; but trying to set myParams.autofill will
produce a compile error.
However, it's excellent that the same LLProcess::create() method can accept
either LLProcess::Params or a properly-constructed LLSD block.
2012-01-21 11:45:15 -05:00
Nat Goodspeed f0dbb87833 Per Richard, replace LLProcessLauncher with LLProcess.
LLProcessLauncher had the somewhat fuzzy mandate of (1) accumulating
parameters with which to launch a child process and (2) sometimes tracking the
lifespan of the ensuing child process. But a valid LLProcessLauncher object
might or might not have ever been associated with an actual child process.
LLProcess specifically tracks a child process. In effect, it's a fairly thin
wrapper around a process HANDLE (on Windows) or pid_t (elsewhere), with
lifespan management thrown in. A static LLProcess::create() method launches a
new child; create() accepts an LLSD bundle with child parameters. So building
up a parameter bundle is deferred to LLSD rather than conflated with the
process management object.
Reconcile all known LLProcessLauncher consumers in the viewer code base,
notably the class unit tests.
2012-01-20 18:10:40 -05:00
Oz Linden f1a4593e47 merge changes for vmrg-204 2011-12-12 09:04:33 -05:00
Richard Linden c191f523a9 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-30 17:57:09 -08:00
Dave Parks 1da7f42224 merge 2011-11-29 12:10:14 -06:00
Richard Linden d089e6c264 bumped up MSVC warning level to 3 to catch more stuff that gcc catches 2011-11-28 19:16:49 -08:00
Brad Payne (Vir Linden) 5374e544ed merge 2011-11-28 10:13:34 -05:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
Leslie Linden abf39f7886 Greatly reduced the number of memcpy operations done on the media plug-in message output pipe
by removing 's = s.substr()' type operations.  The output string is now cleared via 's.clear()'
when its entire contents have been pumped and the beginning of the data is stored as an index
when necessary, rather than modifying the initial string.

Reviewed by davep.
2011-11-21 15:15:26 -08:00
Dave Parks 8a8e9ccdb6 SH-2652 Don't allocate 6000+ strings every frame 2011-11-04 16:15:05 -05:00
callum b94f45db81 Merge with head 2011-10-28 11:01:11 -07:00
callum 343562889e EXP-1471 WIP Add support for zooming web pages by a scale facxtor 2011-10-25 19:34:05 -07:00
Dave Parks c0ca8e5e2e Merge backout of b782a75c99e6 2011-10-14 11:58:35 -05:00
Dave Parks 4331c112ab Backed out changeset b782a75c99e6 2011-10-14 11:52:40 -05:00
Leslie Linden 1c57963673 Removed windows line endings to conform to coding policy. 2011-09-12 11:30:24 -07:00
Richard Linden fc45e9cbf6 Automated merge with http://hg.secondlife.com/viewer-development 2011-09-02 20:24:06 -07:00
Richard Nelson 2154bccdc4 Automated merge with http://hg.secondlife.com/viewer-development 2011-08-31 11:51:38 -07:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
callum d341c400fc EXP-1122 FIX (Viewer) LLQtWebKit should support a JavaScript/content debugger to help content creators
Viewer side changes to enable Web debugger.
2011-08-29 17:13:29 -07:00
callum 0bf3ee7fa7 EXP-1111 FIX LLQtWebKit (and related media system) should log events, progress etc. to make debugging problems easier 2011-08-26 17:27:15 -07:00
Oz Linden 7ffc8b45e2 merge changes for storm-1564 2011-08-19 16:50:08 -04:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Richard Linden 9a9e78740a Automated merge with file:///e:\code\viewer-experience 2011-08-11 10:09:28 -07:00
Richard Linden 70a872c4a2 EXP-700 WIP SLPlugin(s) takes high CPU%
clamp maximum framerate of slplugin to 100Hz
also added assert to catch cases where we're requesting infinite framerate
2011-08-09 16:00:56 -07:00
Dave Parks f302e11962 merge 2011-08-08 15:33:55 -05:00
Xiaohong Bao 5e22062b68 fix for SH-2215: [crashhunters] crash at LLPluginClassMedia 2011-08-05 16:02:05 -06:00
Oz Linden 3369ebc8dd fix DOS line endings 2011-08-04 10:57:03 -04:00
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
callum 7847c8941f EXP-676 FIX As a web developer, I want to access information about the current state of the SL client, such as avatar location 2011-06-09 13:48:35 -07:00