Ansariel
|
5fe09cb64d
|
Merge Viewer-Bear
|
2015-08-22 03:13:17 +02: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 |
|
Nicky
|
b88afb2415
|
Build the media plugins when building Linux x64.
|
2015-05-15 22:10:33 +02:00 |
|
Nicky
|
006190f2a1
|
Merge with tools update.
|
2015-05-05 13:09:27 +02: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 |
|
Ansariel
|
f4bfb1aadf
|
Merge LL V3.7.9 (AIS3 + SSA)
|
2014-10-22 02:02:08 +02:00 |
|
callum_linden
|
e6bfaa3d5b
|
Update to build on Xcode 6.0: fix cocoa NSWindow redefinition error
|
2014-10-17 16:02:50 -07:00 |
|
Nicky
|
e7c90906f8
|
More crashfixing.
|
2014-10-14 00:23:14 +02: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 |
|
Nicky
|
cef556c152
|
More correction in llplugin ...
|
2014-06-10 11:23:07 +02:00 |
|
Nicky
|
87d479e723
|
Fix merge error in llplugin.
|
2014-06-10 10:48:22 +02:00 |
|
Tank_Master
|
8863d9beaf
|
Compile fixes
|
2014-06-09 23:27:05 -07:00 |
|
Tank_Master
|
6babf8abd2
|
Merge LL 3.7.7
|
2014-06-09 11:29:57 -07: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 |
|
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 |
|
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 |
|
Tank_Master
|
03511c75c3
|
Merge LL 3.6.2 release
|
2013-08-05 13:50:45 -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 |
|
Nicky
|
5b1aa51a82
|
Enabled PDB generation for SLPlugin.exe.
|
2013-05-05 23:20:26 +02:00 |
|
Tank_Master
|
d4640277d0
|
Merge LL 3.5.3 release.
|
2013-07-09 16:24:58 -07: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 |