Commit Graph

193 Commits (e75a7983cc4e2e71e78798f6b690282dd4c656d2)

Author SHA1 Message Date
Tank_Master 0a1a351b86 Merge Viewer-Share 2013-10-21 23:51:34 -07:00
Nicky ed4c40a7ab Merge with -lgpl 2013-10-14 20:57:33 +02:00
Merov Linden 1e32b9dd33 Pull merge of lindenlab/viewer-release 2013-10-04 09:47:26 -07:00
Nicky 329ca38457 Merge with -lgpl. 2013-09-14 23:23:26 +02:00
Cinders b628f54f35 Avoid redefinition of NSWindow by forward declaration 2013-10-12 10:48:59 -06:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Nicky 3a14fae164 Memory leak; LLPluginSharedMemory where leaked when a shared memory region was destroyed. 2013-08-18 20:40:11 +02:00
Nicky 16d455e0cf Merge. 2013-08-15 22:22:28 +02:00
simon 71e2efab16 Merge downstream code - Vivox release 2013-08-05 14:50:40 -07:00
Tank_Master 03511c75c3 Merge LL 3.6.2 release 2013-08-05 13:50:45 -07:00
Merov Linden 74e3fb7b33 Pull merge from lindenlab/viewer-release 2013-08-05 12:14:48 -07:00
Nicky 0addf213ed Merge with FS tip. First pass. 2013-08-02 00:40:48 +02:00
Nicky bc3959b41d Do not inlcude llqtwebkit (not needed here). 2013-08-01 23:45:02 +02:00
Nicky 91cd44e10f - Don't use /FIXED:NO for Windows.
- Disable building slplugin when building a 64 bit Windows binary. We use a prebuilt one due to Quicktime.
2013-08-01 23:44:32 +02: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
Nicky 5b1aa51a82 Enabled PDB generation for SLPlugin.exe. 2013-05-05 23:20:26 +02: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
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07: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
Tank_Master 1d43cb8943 Merge SSB push 4 2013-03-08 17:54:49 -08:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tonya Souther 30e8da41b0 Merging Cocoa UI rework. 2013-01-05 13:55:41 -06:00
Nicky ceea332a9c Change old style comments <ND> to <FS:ND> to avoid any future confusion/ 2012-12-16 05:19:32 +01:00
Tank_Master 999bd2130e Merge LL 3.4.0 release 2012-09-13 15:19:30 -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
Tank_Master 991d43709c merge LL 3.3.3 beta 2012-06-16 07:22:27 -07:00
Nicky b27eead1e1 Disable PreventSetUnhandledExceptionFilter. For once it is dubios. And second if using WriteProcessMemory one of the sure ways to set off antivirus software. 2012-04-02 23:27:30 +02: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
Nicky f66ccd1572 Implement extraction of stream metadata (title/artist) with gstreamer. 2012-01-20 23:30:02 +01:00
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01: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