ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
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
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
2282d6b11a
Fixed whitespace issues for merge.
2012-12-13 12:24:17 -08:00
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
eca6199852
Ported slplugin and some other missing components for cocoa.
2012-11-12 18:06:32 -08:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
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
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
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
f1a4593e47
merge changes for vmrg-204
2011-12-12 09:04:33 -05:00
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
1da7f42224
merge
2011-11-29 12:10:14 -06:00
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08:00
5374e544ed
merge
2011-11-28 10:13:34 -05:00
b69be18d7b
merge changes for vmrg-193
2011-11-24 06:56:57 -05:00
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
8a8e9ccdb6
SH-2652 Don't allocate 6000+ strings every frame
2011-11-04 16:15:05 -05:00
b94f45db81
Merge with head
2011-10-28 11:01:11 -07:00
343562889e
EXP-1471 WIP Add support for zooming web pages by a scale facxtor
2011-10-25 19:34:05 -07:00
c0ca8e5e2e
Merge backout of b782a75c99e6
2011-10-14 11:58:35 -05:00
4331c112ab
Backed out changeset b782a75c99e6
2011-10-14 11:52:40 -05:00
1c57963673
Removed windows line endings to conform to coding policy.
2011-09-12 11:30:24 -07:00
fc45e9cbf6
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-02 20:24:06 -07:00
2154bccdc4
Automated merge with http://hg.secondlife.com/viewer-development
2011-08-31 11:51:38 -07:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
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
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
7ffc8b45e2
merge changes for storm-1564
2011-08-19 16:50:08 -04:00
f0bc8a0f71
convert tabs to spaces where they are forbidden
2011-08-17 12:33:23 -04:00
9a9e78740a
Automated merge with file:///e:\code\viewer-experience
2011-08-11 10:09:28 -07:00
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
f302e11962
merge
2011-08-08 15:33:55 -05:00
5e22062b68
fix for SH-2215: [crashhunters] crash at LLPluginClassMedia
2011-08-05 16:02:05 -06:00
3369ebc8dd
fix DOS line endings
2011-08-04 10:57:03 -04:00
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
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
2595d53ded
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-25 18:14:55 -07:00
e9f8a5441b
Added support for pushing agent global location on grid and agent orientation out to LLQtWebKit
2011-05-25 08:10:04 -07:00
e4a9704d41
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-05-13 17:08:43 -07:00
b286a9091b
SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking links in web profile
...
Also fixes SOCIAL-521 and SOCIAL-428
2011-03-25 13:56:14 -07:00
b3e444c74e
SOCIAL-634 FIX Error condition content for Destination Guide, Avatar Picker,
...
and Help if S3 content or web content is not available.
(Included refs to new LLQtWebKit that supports functionality)
2011-03-17 17:18:58 -07:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
11a0785ceb
SOCIAL-595 FIX Global Volume control does not affect volume of MOAP in minimal skin on Windows
...
made slplugin.exe start with correct working directory (llplugin)
2011-03-01 15:03:26 -08:00
29415d1407
Merge
2011-02-23 13:48:35 -07:00
e3ed1565f8
Automated merge up from viewer-development into mesh-development
2011-02-10 10:44:21 -05:00
7e6ce12a17
VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the current working
...
Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-08 15:37:12 -08:00
Oz Linden