callum_linden
16cd296e30
MAINT-5775 FIX Split out cookies and cache directories into separate folders and move cache to same place as viewer cache
2015-10-22 13:24:43 -07:00
callum_linden
8c74ed2a58
Fix windows line endings
2015-10-21 09:05:19 -07:00
callum_linden
6599e10d00
Merge with tip of viewer-release
2015-10-20 16:39:00 -07:00
callum_linden
2a899b49dd
MAINT-5711 FIX profiles and marketplace are asking for a login each session
2015-10-19 18:43:48 -07:00
Rider Linden
cb7f84a470
MAINT-5687: Remove old webkit from the make files and the repo. Ensure that it is no longer meaningfully referenced.
2015-10-02 11:14:28 -07:00
callum_linden
6a119e327d
tmp chckin - still needs latest llceflib to build
2015-09-16 22:14:55 -07:00
callum_linden
236b3b9f84
support for external links and location_changed messages
2015-09-03 18:16:46 -07:00
andreykproductengine
1d3c59f29c
MAINT-5398 FIXED [BetaBreakers] TOS additional policy links cannot be scrolled or closed once opened
2015-07-23 19:15:07 +03:00
callum_linden
8e3acf461e
Changes to implement enable/disable cookies, javascript, plugins
2015-07-17 16:14:42 -07:00
callum_linden
ab9e830306
Refer to new QuickTime third party package with fixes for VS2013 & re-add QuickTime media plugin
2015-03-24 00:42:42 +01:00
Nat Goodspeed
27951fa1d4
First cut at consuming new slplugins autobuild package.
...
The contents are extracted, but not yet built into the viewer installer.
2015-01-07 19:45:51 -05:00
callum_linden
c43b176584
Remove unneeded media plugin header file
2014-12-12 17:43:09 -08:00
callum_linden
e6bfaa3d5b
Update to build on Xcode 6.0: fix cocoa NSWindow redefinition error
2014-10-17 16:02:50 -07:00
Stinson Linden
a13d2f7f70
MAINT-4009: Patching a leak of LLPluginSharedMemory objects from the LLPluginProcessParent class.
2014-05-20 21:03:13 +01:00
Stinson Linden
5537417ac3
MAINT-4009: Ensuring that the cookie store is properly cleaned on app exit.
2014-05-20 01:03:50 +01:00
Richard Linden
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
Richard Linden
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
Merov Linden
1e32b9dd33
Pull merge of lindenlab/viewer-release
2013-10-04 09:47:26 -07:00
Xiaohong Bao
d8c02bf062
Merge
2013-08-19 16:09:28 -06: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
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
Richard Linden
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -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
Richard Linden
0d8f1077a6
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2013-01-04 16:46:25 -08: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
Richard Linden
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
Richard Linden
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08: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