| Age | Commit message (Collapse) | Author |
|---|
|
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
spam warnings while linking on xcode 4.5.2 builds
|
|
|
|
point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake.
|
|
python2.5. This was a holdover from when on linden systems 2.5 was newer than the default, instead of older.
|
|
|
|
|
|
alignment issue in llAppearance.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
performance
Reviewed by Simon.
|
|
|
|
|
|
eliminated min and max macros from windows.h
got rest of viewer to compile against llfasttimer changes
|
|
On Windows, LLPrimitive.cmake named four Boost libraries with names ending in
the string 1_45. Now that we're trying to upgrade Boost to 1.52, those
suffixes are inappropriate. Fortunately the libraries in our current Boost
package do not have version-stamped names, so we hope this fix can survive
for several Boost upgrades to come.
|
|
|
|
|
|
|
|
|
|
|
|
Disable private memory pools. Make viewer large address aware on windows.
Reviewed by Kelly
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CXXFLAG to have cmake generation debug symbols in xcode.
|
|
|
|
|
|
|
|
llrender/llwindow cmake source a bit
|
