Age | Commit message (Collapse) | Author |
|
Two fairly simple conflicts: dead stats sending code in the
texture fetch code (new llcorehttp library) and the cleanup
code in llappviewer was moved around in 3.4.x.
|
|
|
|
This was yet another refresh from v-d because of significant changes
to lltexturefetch that would not have been resolvable by casual
application of any merge tool. There are still a few questions
outstanding but this is the initial, optimistic merge.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Reviewed by YP
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dependency on cmake 2.8.2 for Linux.
|
|
linux
|
|
|
|
|
|
enable Havok Hyrbid (fulldebug) libs to link in Windows RelWithDebInfo. On other platforms, that flag will cause RelWithDebInfo to link against Havok fulldebug libs. The rest of the time, RelWithDebInfo will link to Havok Debug and Debug will link to Havok Fulldebug
|
|
|
|
Tweaked the boost source as per Boost issue #6185 using 1.49.0 sources
and this picks up the new build. Debug viewer builds and runs.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Big delta was converting the new texture debugger support code
to the new library. Viewer manifest should probably get an eyeball
before release.
|
|
|
|
|
|
|
|
|
|
stubbed physicsextension library.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
specified type (release, relwithdebinfo, or debug)
Also, set startup project to SecondLife-bin
|
|
|