livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,931 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

465 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
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
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04: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
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
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
Dave Parks 6dd3840b44 MAINT-646 Factor std::vector out of lloctree 2012-06-05 13:32:18 -05:00
Dave Parks 92ee373e45 MAINT-646 Factor std::set out of lloctree 2012-06-05 12:55:17 -05:00
Brad Payne (Vir Linden) 542975b4c6 merge 2012-06-04 16:19:18 -04:00
Oz Linden c97ddff395 merge changes for storm-1863 2012-05-30 14:24:47 -04:00
Dave Parks b7cfd8c7f0 MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update 2012-05-21 23:33:25 -05:00
Seth ProductEngine bc4d0b0b0f Linux build fix. 
Moved type casts from protected base classes to derived LLCoord.
(transplanted from fa4c01adac7224b909ab1dbfc90416b633e6d6c2)
 2012-02-23 21:02:46 +02:00
Seth ProductEngine a5e4b15b7d Linux build fix. 
Moved type casts from protected base classes to derived LLCoord.
 2012-02-23 21:02:46 +02:00
Merov Linden 5c8bcc4643 Fix Linux compile issue : make templated type casting explicit (2) 2012-02-13 16:39:35 -08:00
Merov Linden e8b8be637b Fix Linux compile issue : make templated type casting explicit 2012-02-13 15:53:41 -08:00
Richard Linden bbdb390624 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/ 2012-02-08 19:55:28 -08:00
Brad Payne (Vir Linden) 635a264e6f merge 2012-02-08 11:22:52 -05:00
Richard Linden f27ea1aff7 EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates 
fixed build
moved conversion funcs to llwindow.cpp as they work on all platforms
refactored translateintorect to take overlap as parameter
 2012-02-07 22:50:49 -08:00
Richard Linden 4e08461f8a EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates 
changed over to new convert() method
added LLCoordFloater
 2012-02-07 19:29:10 -08:00