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
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
1aee2f0d4d
pull from hg.lindenlab.com/viewer-mesh to mesh-development
...
Note all future commits should happen in public mesh-development. Will
ping internal devs to make sure they transition over.
2010-10-27 14:27:10 -04:00
a7143a9998
STORM-418 : merge with viewer-development
2010-10-27 11:06:22 -07:00
b63b6eeecf
STORM-224 : merge with viewer-development
2010-10-27 11:04:44 -07:00
269b7c38f4
STORM-311 : merge with viewer-development
2010-10-27 11:02:38 -07:00
5ad8a2439e
STORM-95 : merge with viewer-development
2010-10-27 10:53:58 -07:00
8947724baa
STORM-482; change to allow 1023 characters again in local chat. While fixing this, I noticed that a change to XUI meant that many floaters had tried to set a limit on text length for line_editor components but it didn't take effect because the parameter name was wrong; I changed them to agree.
2010-10-26 23:13:36 -04:00
ffe475e96e
STORM-418 : Suppress menu items Save to XML and Load from XML from the Develop > XUI menu
2010-10-26 16:08:11 -07:00
e75fd8beb1
merge
2010-10-26 16:20:00 -05:00
da04af47cc
Fix for bad binormals.
2010-10-26 16:19:24 -05:00
dcde5979c3
Anti-alias edge map.
2010-10-26 14:42:09 -05:00
53beeec0a3
Potential fix for crash in renderBloom.
...
Reviewed by Seraph.
2010-10-26 14:31:20 -05:00
cdd930d360
STORM-454 : merge with viewer-development
2010-10-26 12:04:40 -07:00
01e5519323
STORM-454 : Tweak the teleport_coordinate_z width to better align in world map UI
2010-10-26 11:28:39 -07:00
57cbcdc9ec
Adding back in fix for convex hull size incompatibility after backout of previous checkin.
2010-10-26 11:20:48 -07:00
0a8d43e844
Backing out latest change to undo static cache file changes
2010-10-26 11:11:20 -07:00
ebce1a4ea8
STORM-416 : merge with viewer-development
2010-10-26 10:59:37 -07:00
e4a5d16be1
Fixed convex hull size incompatibility in mesh assets.
2010-10-26 10:31:48 -07:00
2e919b6ccd
merge with viewer-development
2010-10-26 10:03:36 -07:00
a40a2a7a46
STORM-350 : merge with viewer-development
2010-10-25 13:46:36 -07:00
0977ecca96
STORM-173 : merge with viewer-development
2010-10-25 13:45:06 -07:00
3116e0d352
STORM-426 : merge with viewer-development
2010-10-25 13:43:22 -07:00
2a5902f75f
STORM-449 : merge with viewer-development
2010-10-25 13:39:11 -07:00
92959895e2
Automated merge up from viewer-development
2010-10-25 16:20:37 -04:00
bf49b56b3a
merge viewer-beta, resolve STORM-341 conflict
2010-10-25 13:13:17 -07:00
066986a09e
Automated merge up from viewer-development
2010-10-25 16:10:35 -04:00
1a53efe233
merge viewer-beta to viewer-development
2010-10-25 13:07:56 -07:00
80cbe66039
apply fixes for STORM-341, not quite a transplant
2010-10-25 16:06:03 -04:00
78f291a722
pull viewer-beta in viewer-development
2010-10-25 12:08:58 -07:00
Nyx (Neal Orman)