Nicky
|
8e4d6926af
|
Convert to Unix EOL.
|
2013-03-23 13:02:36 +01:00 |
|
Tank_Master
|
7fab30cab4
|
update NACL Graphics crasher protection code. (work done by Chalice of NACL - 26104; 1799bdb6549e)
|
2013-03-20 10:11:16 -07:00 |
|
Nicky
|
7fdaf72389
|
Make GCC 4.7.1 happy.
|
2013-03-12 11:38:40 +01:00 |
|
Tank_Master
|
6207030884
|
Merge FS LGPL tip
|
2013-02-23 17:09:53 -08:00 |
|
Tank_Master
|
e1ee0494bf
|
Merge FS LGPL
|
2013-02-08 00:14:47 -08:00 |
|
Tank_Master
|
ea86bb88c3
|
first pass merge
|
2013-02-04 10:52:32 -08:00 |
|
Tank_Master
|
169263d8b0
|
Merge LL 3.4.5 beta 3
|
2013-01-28 01:56:00 -08:00 |
|
Ansariel
|
1195f259ba
|
Added megaprim crash fix in octree from NaCl / Chalice Yao
|
2013-01-27 15:28:15 +01:00 |
|
Tank_Master
|
cc44316aed
|
Merge LL 3.4.3,
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
|
2012-12-18 00:36:35 -08:00 |
|
simon@Simon-PC.lindenlab.com
|
40e78a80cc
|
Pull and merge viewer-development
|
2012-12-04 14:31:15 -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 |
|
simon@Simon-PC.lindenlab.com
|
8c8c2f3b94
|
Fix angry Linux and Mac builds
|
2012-10-17 11:28:51 -07:00 |
|
Dave Parks
|
7ebbb5067d
|
MAINT-1709 Factor out realloc
Reviewed by VoidPointer
|
2012-10-11 17:02:45 -05:00 |
|
Brad Payne (Vir Linden)
|
a039b7c489
|
Fixes for build issues, missing LLCOMMON_SYSTEM_INCLUDE_DIRS in some libraries
|
2012-10-11 13:29:36 -04:00 |
|
Don Kjer
|
c06c35609c
|
Updating linux build to gcc4.6
|
2012-10-11 00:09:04 +00:00 |
|
Oz Linden
|
d5dbd2e9c1
|
fix dos line endings
|
2012-09-27 13:02:07 -04:00 |
|
Don Kjer
|
8ba2b38876
|
Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.
|
2012-09-13 10:25:48 +00:00 |
|
simon@Simon-PC.lindenlab.com
|
e6346ffdcf
|
Restore alignment tests that were removed earlier
|
2012-09-12 18:08:35 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
cd315c0ecd
|
Fix alignment_test for array allocations. Reviewed by Runitai
|
2012-09-12 16:00:12 -07:00 |
|
Dave Parks
|
8a359ddaea
|
Another attempt at unsticking build.
|
2012-09-12 16:55:19 -05:00 |
|
Dave Parks
|
094a5bc89e
|
Attempt to unblock build.
|
2012-09-12 16:13:01 -05:00 |
|
Dave Parks
|
8b4d91e2f3
|
Another stab at fixing alignment_test.cpp
|
2012-09-11 16:58:36 -05:00 |
|
Dave Parks
|
d1c34bff37
|
Fix for alignment_test.cpp compilation errors.
|
2012-09-10 13:16:10 -05:00 |
|
Nat Goodspeed
|
55a812ca77
|
Automated merge with http://hg.secondlife.com/viewer-development
|
2012-11-06 16:37:51 -05:00 |
|
Dave Parks
|
b8e14ad2b2
|
MAINT-1709 Fix for >> that should have been > >
|
2012-10-26 15:55:58 -05:00 |
|
Dave Parks
|
cdbfdfc351
|
MAINT-1709 Factor out realloc
Reviewed by VoidPointer
|
2012-10-11 17:02:45 -05:00 |
|
Nat Goodspeed
|
76333248a8
|
#include <string.h> in v3color.h: recent Linux compilers care.
Linux dev builds have started breaking because v3color.h uses strlen() and
strncpy() without declaring them. Add relevant #include, which fixes.
|
2012-10-10 09:04:31 -04:00 |
|
Dave Parks
|
4127f3e7fc
|
reapply efcec3eb374f: MAINT-646 Factor std::vector out of lloctree
|
2012-09-20 09:48:56 -04:00 |
|
Dave Parks
|
cf98064700
|
reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree
|
2012-09-20 09:48:55 -04:00 |
|
Dave Parks
|
8f7bb8f6d5
|
Port over Simon's fix for alignment test
|
2012-09-13 20:31:22 -05:00 |
|
Dave Parks
|
9ec263d2f1
|
MAINT-1503 Minimal set of changes needed to safely disable tcmalloc
|
2012-09-12 15:44:36 -05:00 |
|
Oz Linden
|
97d969a338
|
initial attempt to restore changes that make removing tcmalloc possible; not tested
|
2012-09-12 14:36:37 -04: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 |
|
Dave Parks
|
980d5a7555
|
MAINT-1503 Fix for ll_aligned_realloc returning non-aligned pointers on linux
|
2012-08-31 16:30:58 -05:00 |
|
Tank_Master
|
4158399a84
|
merge LL 3.4.2 beta 11
|
2012-10-30 14:49:58 -07:00 |
|
Tank_Master
|
93d4b47252
|
Merge LL 3.4.1 beta 10
|
2012-10-26 09:59:19 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
173d0fa213
|
Pull in viewer-development because it's painful. Merge with runitai's help.
|
2012-07-11 16:15:23 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
b7555a3309
|
Merge back viewer-lion, which has viewer-development and down-stream fixes
|
2012-08-01 14:07:24 -07:00 |
|
Dave Parks
|
4a5ad35793
|
MAINT-570 Remove unused memory tracking system LLMemType
|
2012-07-20 11:42:15 -05:00 |
|
Oz Linden
|
9b1208e495
|
disable alignment tests in debug builds (where they fail)
|
2012-07-02 10:18:38 -04:00 |
|
Oz Linden
|
2c3e78f1f1
|
merge changes for DRTVWR-167
|
2012-06-27 14:18:22 -04:00 |
|
Brad Payne (Vir Linden)
|
89ee86c86c
|
line endings fix
|
2012-06-22 15:54:53 -04:00 |
|
Dave Parks
|
9e9d32de38
|
merge
|
2012-06-22 14:04:33 -05:00 |
|
Dave Parks
|
99dc246ac8
|
Merge
|
2012-06-15 14:29:46 -05:00 |
|
Tank_Master
|
999bd2130e
|
Merge LL 3.4.0 release
|
2012-09-13 15:19:30 -07:00 |
|
Tank_Master
|
d9c7b9253d
|
merge LL 3.4.0 viewer-beta
|
2012-08-31 00:18:30 -07:00 |
|
Tank_Master
|
8cb09ca444
|
Merge to FS LGPL 29865
|
2012-08-30 15:45:02 -07:00 |
|
Tank_Master
|
cb24ec2e0d
|
merge LL 3.3.4 beta
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
|
2012-07-16 21:59:14 -07:00 |
|
Nicky
|
041caea176
|
Include <string.h> for strlen/strncpy.
|
2012-08-07 17:55:14 +02:00 |
|
Dave Parks
|
6dd3840b44
|
MAINT-646 Factor std::vector out of lloctree
|
2012-06-05 13:32:18 -05:00 |