Tank_Master
|
f1ebde1820
|
Merge SSA push 5 (part 2, post CHUI stuff)
|
2013-03-20 17:19:19 -07:00 |
|
Nicky
|
01acef548f
|
Upload openjpeg-1.4-windows-20110622.tar.bz2 to downloads.phoenixviewer.com.
|
2013-03-07 05:49:53 +01:00 |
|
Tank_Master
|
63adc57b38
|
Update 3 of SSB + RLVa
|
2013-03-05 18:57:27 -08:00 |
|
Kitty Barnett
|
6d70e692bd
|
Merged with viewer-sunshine tip (Revision 230637f9ff30)
--HG--
branch : Viewer-Build
|
2013-03-02 17:05:57 +01:00 |
|
Nicky
|
38cbe8bd89
|
FIRE-9259; Update colladadom.
|
2013-02-25 22:36:27 +01:00 |
|
Tank_Master
|
6425b3cd65
|
Merge RLVa SSB update
|
2013-02-24 18:24:48 -08:00 |
|
Tank_Master
|
6207030884
|
Merge FS LGPL tip
|
2013-02-23 17:09:53 -08:00 |
|
Kitty Barnett
|
338ddadb87
|
Merged with viewer-sunshine tip (Revision 87a6fc812214)
--HG--
branch : Viewer-Build
|
2013-02-20 13:32:02 +01:00 |
|
Don Kjer
|
429d8250dd
|
Updating appearance utility
|
2013-02-19 23:05:31 +00:00 |
|
Cinders
|
2c9e821188
|
Rename HAS_OPENSIM_SUPPORT switch to OPENSIM
|
2013-02-18 21:24:20 -07:00 |
|
Don Kjer
|
be21b989c5
|
Updating appearance util
|
2013-02-11 19:52:07 +00:00 |
|
Don Kjer
|
93f07d4e27
|
Updating appearance utility
|
2013-02-09 01:18:36 +00:00 |
|
Don Kjer
|
b342b96b3a
|
Updating appearance utility
|
2013-02-09 00:43:56 +00:00 |
|
Cinders
|
a91ab20418
|
Fix indentation in autobuild.xml
|
2013-02-08 16:07:07 -07:00 |
|
Tonya Souther
|
593da0e065
|
Turn OpenSim support on by default in RelWithDebInfo builds.
|
2013-02-08 15:24:47 -06:00 |
|
Tank_Master
|
ea86bb88c3
|
first pass merge
|
2013-02-04 10:52:32 -08:00 |
|
Nyx Linden
|
946d3bbcc6
|
SH-3651 FIX Beards not visible on server-generated appearances.
Fixed back end to enable beards.
|
2013-01-30 17:35:36 -05:00 |
|
Tank_Master
|
169263d8b0
|
Merge LL 3.4.5 beta 3
|
2013-01-28 01:56:00 -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 |
|
Don Kjer
|
06baa6bf9c
|
Moving appearance utility deb to private repo
|
2013-01-18 21:22:18 +00:00 |
|
Nicky
|
7eeed2df6b
|
Update for boost-1.52. Compiled with GCC 4.4.5.
|
2013-01-09 12:31:04 +01:00 |
|
Dave Parks
|
954ebaed84
|
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
|
2013-01-08 13:40:59 -06:00 |
|
Chalice
|
a80b20ad42
|
Replaced referenced 64bit libpng package with a 32bit one. whoops.
|
2013-01-05 23:19:58 +01:00 |
|
Tonya Souther
|
30e8da41b0
|
Merging Cocoa UI rework.
|
2013-01-05 13:55:41 -06:00 |
|
Chalice
|
dadc185c1a
|
Added a fix and updated libs for some linux distributions crashing on opening the file picker.
|
2012-12-25 19:01:56 +01:00 |
|
Tank_Master
|
fd67a51a7b
|
Merge LGPL
|
2013-01-03 12:07:47 -08:00 |
|
Tonya Souther
|
0c0a84bf88
|
Fall back to Freetype 2.3.9 for OS X.
|
2013-01-02 07:11:32 -06:00 |
|
Ansariel
|
ce82de6a5c
|
Fallback to Freetype 2.3.9 for Windows
|
2013-01-02 07:56:25 +01:00 |
|
Cinders
|
958723f04a
|
Fix screwy Xcode indentation. :/
|
2012-12-21 08:51:45 -07:00 |
|
Cinders
|
0336a0e4cf
|
Update darwin boost libs to 1.52.0
|
2012-12-21 08:47:37 -07:00 |
|
Tank_Master
|
1762586923
|
Merge LL 3.4.4 beta 1, but left tcmalloc enabled.
|
2012-12-21 01:14:38 -08:00 |
|
Don Kjer
|
e1af26eaa2
|
Disabling build of headless appearance utility
|
2012-12-20 21:39:33 +00:00 |
|
Oz Linden
|
1c7f19c865
|
change to use lindenlab repo for havok source, with new license
|
2012-12-19 09:45:28 -05:00 |
|
Oz Linden
|
0ed83541bf
|
upgrade boost build to use public build of icu4c
|
2012-12-19 09:41:59 -05:00 |
|
Kitty Barnett
|
b79d5d7c58
|
Merged with viewer-sunshine tip (Revision bd1162cb6fbe)
--HG--
branch : Viewer-Build
|
2012-12-18 16:00:02 +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 |
|
Tank_Master
|
5b5f4c8bf5
|
Merge LL 3.4.2 release,
broken revision, KDU package needs updating, mac packager also likely broken
|
2012-12-14 07:59:55 -08:00 |
|
Don Kjer
|
8eef31e47a
|
Updating appearance utility to deal with IMG_INVISIBLE
|
2012-12-12 20:58:56 +00:00 |
|
Don Kjer
|
531394df23
|
Updating linux libGLOD to match darwin naming
|
2012-12-12 00:34:40 +00:00 |
|
Don Kjer
|
5798dd54cc
|
Fix for building on case-sensitive mac filesystems. Fix to remove unwind spam warnings while linking on xcode 4.5.2 builds
|
2012-12-11 13:56:50 -08:00 |
|
Tank_Master
|
2e086b1a17
|
update apr package to include more pdb files
|
2012-12-10 10:13:04 -08:00 |
|
Don Kjer
|
23d77d3a34
|
Automated merge
|
2012-12-06 22:56:21 +00:00 |
|
Don Kjer
|
07d05c2967
|
Alpha rendering fixes for appearance utility.
|
2012-12-06 22:54:50 +00:00 |
|
prep
|
32f5015ecd
|
Added back in mesa package for linux builds
|
2012-12-05 14:33:30 -05:00 |
|
simon@Simon-PC.lindenlab.com
|
7fe4fbe674
|
Pull in upstream viewer-development via viewer-lion
|
2012-12-04 15:03:34 -08:00 |
|
Don Kjer
|
96ef49df75
|
Automated merge
|
2012-11-28 23:46:06 +00:00 |
|
Don Kjer
|
dc71cae16b
|
Updating appearance utility
|
2012-11-28 23:45:23 +00: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 |
|
Kitty Barnett
|
30122df50e
|
Merged with default tip (Revision 013b7323f79a)
--HG--
branch : Viewer-Build
|
2012-11-27 18:55:05 +01:00 |
|
Dave Parks
|
5d34ac552f
|
Automated merge with https://bitbucket.org/lindenlab/viewer-development
|
2012-11-20 17:03:55 -06:00 |