cef556c152
More correction in llplugin ...
2014-06-10 11:23:07 +02:00
87d479e723
Fix merge error in llplugin.
2014-06-10 10:48:22 +02:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
1e32b9dd33
Pull merge of lindenlab/viewer-release
2013-10-04 09:47:26 -07:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
71e2efab16
Merge downstream code - Vivox release
2013-08-05 14:50:40 -07:00
74e3fb7b33
Pull merge from lindenlab/viewer-release
2013-08-05 12:14:48 -07:00
bdd8005721
ACME-755 : Fix erasing in live std::map (breaks build on Mac and Linux).
2013-07-29 12:09:29 -07:00
7b56020d66
ACME-755 Clear FB cookies by removing cookies from the .facebook.com domain
2013-07-26 18:49:31 -07:00
ce9962b338
Merged in viewer-release
2013-07-11 17:49:13 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
8642f57dd9
Removed debugging.
2013-05-16 10:31:33 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
291b387178
Cmake doesn't like me
2013-05-02 15:36:26 -07:00
299433c544
Fix the cmake fix
2013-05-02 15:13:05 -07:00
104f576400
Fix Windows Debug build
2013-04-23 16:27:24 -07:00
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
0a1a351b86
Merge Viewer-Share
2013-10-21 23:51:34 -07:00
ed4c40a7ab
Merge with -lgpl
2013-10-14 20:57:33 +02:00
329ca38457
Merge with -lgpl.
2013-09-14 23:23:26 +02:00
b628f54f35
Avoid redefinition of NSWindow by forward declaration
2013-10-12 10:48:59 -06:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
3a14fae164
Memory leak; LLPluginSharedMemory where leaked when a shared memory region was destroyed.
2013-08-18 20:40:11 +02:00
16d455e0cf
Merge.
2013-08-15 22:22:28 +02:00
03511c75c3
Merge LL 3.6.2 release
2013-08-05 13:50:45 -07:00
0addf213ed
Merge with FS tip. First pass.
2013-08-02 00:40:48 +02:00
bc3959b41d
Do not inlcude llqtwebkit (not needed here).
2013-08-01 23:45:02 +02:00
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
5b1aa51a82
Enabled PDB generation for SLPlugin.exe.
2013-05-05 23:20:26 +02:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
0d8f1077a6
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2013-01-04 16:46:25 -08: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
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
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
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
1d43cb8943
Merge SSB push 4
2013-03-08 17:54:49 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
30e8da41b0
Merging Cocoa UI rework.
2013-01-05 13:55:41 -06:00
ceea332a9c
Change old style comments <ND> to <FS:ND> to avoid any future confusion/
2012-12-16 05:19:32 +01:00
999bd2130e
Merge LL 3.4.0 release
2012-09-13 15:19:30 -07:00
Nicky