853e90ea80
removed unused variable
2010-11-08 10:37:58 -05:00
3d41e67d7b
BUILDFIX: commented out unused variable which breaks the mac build.
2010-11-05 18:51:43 -04:00
d20412321b
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-05 17:58:32 -04:00
985f4f911e
SH-396 FIX mac build on mesh-development is broken
...
Adding collada to the list of libraries we need to package with the viewer
Not sure why this wasn't here earlier, but this should solve the packaging problem.
2010-11-05 17:58:13 -04:00
69062ccf7b
merge
2010-11-05 17:13:17 -04:00
1c2379becb
SH-396 WIP mac build broken on mesh-development
...
Finally fixed collada dynamic library location issue. Should fix mac build if the library
is being packaged properly.
2010-11-05 16:28:19 -04:00
7318214ed3
merge
2010-11-05 16:17:54 -04:00
ddff1c68f2
additional analysis for --analyzeperformance option
2010-11-05 16:17:24 -04:00
4a80668567
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-05 14:26:30 -04:00
1f9ae081ec
BUILDFIX making curl asserts llinfos for non-windows platforms
...
linux curl appears to throw an initialization error once per session
after login. Can't hunt it down right now, so making curl asserts
llinfos for non-windows platforms. Also added a new assert on curl
initialization.
2010-11-05 14:26:25 -04:00
bbf581726a
SH-396 WIP fix mac mesh-development build
...
Fixed the mac references to Collada14Dom.dylib I think. Fingers crossed!
2010-11-04 21:11:38 -04:00
a2b25828aa
BUILDFIX curl error causes linux build to crash on login.
...
Switching curl errors from llerrs to llinfos allows the client to continue
on its merry way. Will file a jira to follow up later on why the error
happens in the first place.
2010-11-04 17:50:10 -04:00
fefae4c639
SH-396 WIP fix mac teamcity build for mesh-development
...
making sure we're copying over the necessary 3rd party library in the packaging stage
2010-11-04 16:26:27 -04:00
aa6256b089
SH-396 FIX fix mac build on mesh-development branch
...
autobuild recently changed to not upload to s3 without an explicit command-line
argument. Re-uploaded (this time to s3) colladadom for mac, and updated install.xml
2010-11-04 11:11:03 -04:00
ffb8b78ae9
Reverting fix for SH-391 until it works for all use cases
2010-11-03 17:11:08 -07:00
5ca2839612
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-03 19:02:31 -04:00
6c0c1c47e7
SH-396 FIX mac opensource build
...
Trying a new collada package for mac
2010-11-03 19:02:26 -04:00
117af7e7e3
Fix for SH-391 'Viewer crash when enabling align planar faces on a mesh object'. Paired with Runitai
2010-11-03 13:23:53 -07:00
3bccefff5f
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-02 20:32:26 -04:00
688a818259
SH-395 FIX fixes for linux and windows collada libraries
...
updating windows collada libraries
2010-11-02 20:32:20 -04:00
278dac7ce7
Reverting code for fixing non-uniform scale for mesh uploads as it breaks rigged meshes.
2010-11-02 16:25:29 -07:00
4599ade7a1
SH-395 FIX linux build on mesh-development is broken
...
last package had the wrong version of the binary library packaged with it.
I'm hoping this should fix our linux teamcity issues.
2010-11-01 12:11:30 -04:00
a048f4be50
Automated merge with https://hg.secondlife.com/mesh-development
2010-10-29 18:03:48 -04:00
7fd39cb3dc
SH-395 FIX linux mesh-development teamcity build broken
...
rebuilt colladadom yet again, and confirmed that we're depending on the
correct version of pcre.
2010-10-29 18:03:41 -04:00
ed29cac3a1
SH-92 Fix for busted bounding boxes for mirrored meshes.
2010-10-29 16:10:17 -05:00
2ca8a4865a
SH-184 Don't render loading meshes as tetrahedrons.
2010-10-29 15:34:03 -05:00
8c950152ea
Fix for release build (misspelled llprimitive)
2010-10-29 15:24:13 -05:00
474c0dba59
merge
2010-10-29 15:06:34 -05:00
4eec9dd54e
SH-262 Fix for debug build on windows.
2010-10-29 15:06:09 -05:00
93f8932900
Automated merge with https://hg.secondlife.com/mesh-development
2010-10-29 15:11:57 -04:00
5b7679c71f
SH-395 FIX linux build broken for mesh-development
...
Trying to rebuild colladadom against an old version of pcre so that the
link step doesn't search for functions that don't exist.
2010-10-29 15:11:53 -04:00
b6140462bf
merge
2010-10-29 12:07:21 -05:00
b32cb5b1e4
Fix for assert in pipeline on startup.
2010-10-29 12:07:02 -05:00
e8a92e6910
Fix for sometimes missing the color value on last vertex of a face.
2010-10-29 12:06:45 -05:00
78e62d0030
Fix for bad normals on some prim faces.
2010-10-29 12:06:20 -05:00
2ee9d84f6d
SH-395 FIX linux opensource mesh viewer is broken on teamcity
...
Fixed the pcre autobuild scripts to include the resulting library files
and put them in the correct place. I think this should fix the build.
2010-10-29 12:11:41 -04:00
2bd690dffb
Automated merge with https://hg.secondlife.com/mesh-development
2010-10-28 20:51:03 -04:00
2115e63a85
SH-395 SH-396 WIP fix mac and linux builds for opensource mesh branch
...
MAC: naming problem on collada library files (.dylib). updated install.xml
to refer to the fixed package
LINUX: PCRE was too out of date for our collada implementation. Created a new
PCRE package and updated install.xml to match it.
2010-10-28 20:50:47 -04:00
cae0544519
merge
2010-10-28 17:43:39 -05:00
94c2e4c0ae
Fix for NAN getting copied for some color values (NAN is purple).
2010-10-28 17:40:28 -05:00
3084bd5209
Only force an update if a flexible object is visible.
2010-10-28 17:40:01 -05:00
798ba26952
More aggressive management of FBOs. Allocate as few FBOs as possible, assert when FBOs are destroyed out of order.
2010-10-28 17:39:45 -05:00
dda21d67e5
Fix for CTS-305 'Uploaded meshes have uniform scale'
2010-10-28 14:32:00 -07:00
9c1d9665f7
Append logs of multivariant builds correctly.
2010-10-28 12:46:16 -07:00
0207e04f0d
SH-395 WIP fixing linux build in opensource mesh branch
...
Reverting a previous cmake fix as we're not set up to use debug
libraries on non-windows platforms. Also removing references to
debug versions of tcmalloc to unstick the build.
2010-10-28 15:15:04 -04:00
a91bff4036
merge
2010-10-28 13:54:43 -04:00
53d5fd1e9b
- Pelvis offsets are now preserved
...
- Fix for CTS-261
2010-10-28 13:40:15 -04:00
32bcdd1199
SH-396 WIP fix mac opensource build for mesh viewer
...
Collada library file was being named incorrectly by autobuild,
resulting in the build being unable to find the library even though
it was downloaded. Updated the package, hopefully this will fix the linker error.
2010-10-28 11:44:10 -04:00
e0ba584ecc
SH-395 WIP fix linux opensource mesh teamcity build
...
cmake wasn't configured to use the right directories on the viewer for
debug libraries. Trying to update the config.
2010-10-27 19:40:03 -04:00
225ffbba20
Automated merge up from viewer-development
2010-10-27 15:08:21 -04:00
Brad Payne (Vir Linden)