Commit Graph

349 Commits (ddff1c68f22fbee00178d223eaac382836dba5f7)

Author SHA1 Message Date
Nyx (Neal Orman) e39d616999 SH-329 WIP get mesh branch ready for opensource
adding windows convex decomp stub library.
2010-10-21 18:14:56 -04:00
Nyx (Neal Orman) dd0d5ffaa0 SH-329 WIP get mesh branch ready for open source
de-minimis change fixing install.xml to use the right capitalization of "lgpl"
so that the convex decomp stub library gets downloaded
2010-10-21 16:32:54 -04:00
Loren Shih 7687653871 Automated merge up from viewer-development 2010-10-20 12:18:33 -04:00
Nyx (Neal Orman) 500e8f2376 SH-329 SH-332 WIP BUILDFIX update linux colladadom
Verified my fix actually removes dependency on GLIBC 2.4 this time.
Sorry for thrashing on install.xml :)
2010-10-18 18:04:09 -04:00
Nyx (Neal Orman) 4dc9875310 SH-329 SH-332 WIP update colladadom to work on linux
Trying again, this time with proper build flags so we don't run into
versioning issues, since the lib is built on ubuntu but has to link
on an older build machine
2010-10-18 13:30:43 -04:00
Nyx (Neal Orman) 83677753bb SH-332 SH-329 update colladadom for open source release
Trying to repackage colladadom for linux as static linking, test
impact on unresolved dependencies.
2010-10-18 12:29:32 -04:00
Dave Parks 22edf673cf merge 2010-10-15 19:51:28 -05:00
Dave Parks 12bd7a40d6 Update llconvexdecomp 2010-10-15 19:51:00 -05:00
Nyx (Neal Orman) f670360d45 SH-329 WIP get branch ready for open source release
updated build config to strip havok debug symbols
also added mac convex decomp stub lib.
2010-10-15 19:29:31 -04:00
Nyx (Neal Orman) 75c8a1c995 SH-331 SH-332 FIX SH-329 WIP fix: colladadom for mac/linux wip: decompstub
updating install.xml with the new packages for colladadom for mac & linux
updating install.xml with decomposition stub for linux (mac and win will come later)
2010-10-15 18:48:22 -04:00
Dave Parks 997d66d348 Fix for various crashes on exit and leaks when using convex decomposition.
Make rendering of convex hullified prims work in physics shape display.

Reviewed by Falcon.
2010-10-15 16:33:22 -05:00
Dave Parks c0d882fbff Updated colladadom. 2010-10-14 11:26:59 -05:00
Nyx Linden 26fc1c1755 SH-64 WIP update GLOD on mac
Trying again, this time adding SDK versions to GLOD's linker commands
as well as its compile command. Ugh.
2010-10-07 22:02:59 -04:00
Nyx Linden 1fc2b09b45 SH-64 WIP update GLOD on mac
Trying this again, attempting one more update to fix the issues of not
being able to run with GLOD on 10.5.
2010-10-07 21:15:41 -04:00
Dave Parks ca1f7828b2 Update convex decomp and physics shape display to include convex hulls for prims where appropriate. 2010-10-07 15:37:07 -05:00
Merov Linden 6697a7179b STORM-137 : Points install.xml to the newly built fmod libs 2010-10-07 17:11:17 -07:00
Matthew Breindel (Falcon) d0e32770d7 Merge 2010-09-30 13:36:04 -07:00
Matthew Breindel (Falcon) 60f8c82790 Merge 2010-09-30 12:00:29 -07:00
Nyx Linden 462fc3ce2e merge 2010-09-30 11:11:22 -04:00
Nyx Linden 836ca9145b SH-64 FIX update GLOD on mac
built new glod against gcc 4.0 and SDK 10.4, so it should run on all OSX
systems back to 10.4. Updating install.xml with the new package.
2010-09-30 10:58:29 -04:00
Nyx (Neal Orman) af5d873719 SH-107 WIP fix broken Delaunay option in convex decomp
whoops. misspelled the address of the new package.
2010-09-29 11:29:59 -04:00
Nyx (Neal Orman) 3ceb8710fb SH-107 WIP fix broken Delaunay option in convex decomp panel
updating the convex decomp library (built by falcon) to fix the broken
Delaunay option.
2010-09-29 11:22:25 -04:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Nyx (Neal Orman) e0588af087 SH-211 FIX use updated tcmalloc lib on linux
Previous version was rejected by our build machines. This update was
build with -fno-stack-protector, so should be able to be built by
teamcity.
2010-09-23 19:04:52 -04:00
Nyx (Neal Orman) f73a0c2e13 Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/ 2010-09-23 16:46:08 -04:00
Nyx (Neal Orman) 7f9285979d WIP make tcmalloc work on linux (JIRA pending)
First pass at integrating the linux version of tcmalloc.

Code will be reviewed in a later commit before pushing.
2010-09-23 14:59:03 -04:00
Nyx Linden 245842a765 SH-64 update GLOD on mac
updated GLOD again to be searched for in the correct place and
updated some cmake configuration to ensure that it is being referred to
in the correct places.

This appears to finally solve our mac startup crash.
2010-09-23 11:25:40 -04:00
Matthew Breindel (Falcon) 569f3f4b06 Merge 2010-09-22 13:04:53 -07:00
Nyx Linden c20400a4c9 Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/ 2010-09-22 12:06:22 -04:00
Nyx Linden 469001dabd SH-64 update glod on mac
GLOD libraries were being copied to the lib as lowercase, where mac
expects GLOD to be capitalized (linux expects lowercase).
Updating to new lib with correct capitalization.
2010-09-22 12:05:41 -04:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Dave Parks ad3dd05f4a merge 2010-09-20 18:46:54 -05:00
Nyx (Neal Orman) a6592b7836 SH-66 FIX update glod on linux
previously built package depended on an updated glibc, which our build hosts
don't have (they're old debian systems). This is due to Ubuntu turning on
stack protection by default for its builds (I build on Ubuntu).
This updated package was built with no stack protection and thus should
unstick the build.

 -Nyx
2010-09-20 17:32:32 -04:00
Dave Parks e18e26e87c Use tcmalloc for windows (gives auto-magical 16-byte alignment whenever needed, much faster than Visual C++ malloc). 2010-09-19 23:07:56 -05:00
Nyx (Neal Orman) 27085e91fd Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/ 2010-09-17 11:21:15 -04:00
Nyx Linden f4b504ef39 SH-64 FIX update glod on mac
updating install.xml to use the new glod autobuilt library.
2010-09-16 16:20:46 -04:00
Nyx (Neal Orman) bee6028184 SNOW-606 REVERT libuuid removal
backing out patch from SNOW-606 as it breaks the build on our linux
build machines. Can be re-applied when our build machines get an updated
version of libuuid.
2010-09-16 14:54:23 -04:00
Nyx (Neal Orman) e70d0b62ea SH-66 FIX update GLOD on linux
changing install.xml to have the latest glod package already built.
2010-09-16 14:52:33 -04:00
Nyx (Neal Orman) fd98ea14d2 Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/ 2010-09-13 18:02:59 -04:00
Matthew Breindel (Falcon) 0e14bab3b0 Installed new llcovexdecomp package for linux. 2010-09-13 15:02:31 -07:00
Nyx (Neal Orman) d609533c20 Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/ 2010-09-13 17:19:38 -04:00
Nyx (Neal Orman) 9c06a3538e CTS-241 FIX update glod and convex decomp for linux and mac
pushing fix for glod to work on linux.
2010-09-13 17:19:30 -04:00
Dave Parks d55576278b merge 2010-09-09 16:58:16 -05:00
Dave Parks ac7ac2adec GLOD update for windows, poke CMakeLists.txt to copy shared libs over if glod is touched. 2010-09-09 16:55:54 -05:00
Nyx (Neal Orman) 13180604e5 SNOW-606 FIX disable packaging of libuuid
Patch taken from JIRA, committing locally to fix our project branch.
Code reviewed by Nyx / Brad
2010-09-08 11:30:50 -04:00
Dave Parks e68f9e566b merge 2010-08-31 16:37:40 -05:00
Tofu Linden 438e42edcf Linux rebuild of llqtwebkit from the following sources:
revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a of http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 81ab5ae326f0 of http://hg.secondlife.com/llqtwebkit (currently head of the default branch)
2010-09-23 13:45:12 +01:00
Richard Linden 1911993cc7 merge 2010-09-16 19:45:57 -07:00
Monroe Linden 34ef02db00 Matching Windows build of llqtwebkit. 2010-09-16 11:46:29 -07:00
Monroe Linden 531b77a948 Enable web popups to specify size and position of the Media Browser window from javascript.
This includes a Mac build of llqtwebkit from the following sources:

revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a of http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 81ab5ae326f0 of http://hg.secondlife.com/llqtwebkit (currently head of the default branch)

Reviewed by Callum.
2010-09-15 14:39:42 -07:00