summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2016-12-05lower the verbosity of makensis to emit only warnings and errorsOz Linden
2016-12-05suppress VS linker warning about unfound pdb filesOz Linden
2016-12-05merge callum fixesOz Linden
2016-12-02Remove winmmshim 'hack' from project and set volume directly from CEF media ↵Callum Prentice
plugin using Windows system call. WinMMShim was only needed for XP systems and since we no longer support XP, it is not required.
2016-12-02show the build address size in the About boxOz Linden
2016-12-02add viewer channel and version to the beginning of the About box Licenses ↵Oz Linden
information
2016-12-01DRTVWR-418: Until we figure out how to say FIXED:NO to linker, don't.Nat Goodspeed
The present CMake logic wants to pass FIXED:NO to the linker for 64-bit builds, which on the face of it seems like a Good Thing: it permits code to be relocated in memory, preventing collisions if two libraries happen to want to load into overlapping address ranges. However the way it's being specified is wrong and harmful. Passing /FIXED:NO to the compiler command line engages /FI (Forced Include!) of a nonexistent file XED:NO -- producing lots of baffling fatal compile errors. Thanks Callum for diagnosing this!
2016-12-01DRTVWR-418: In 64 bits, storing size_t in an int is a no-no.Nat Goodspeed
2016-11-30DRTVWR-418: Adjust for LL_VIEWER_CHANNEL coming in unquoted.Nat Goodspeed
Evidently the LL_VIEWER_CHANNEL macro (defined on the compiler command line) used to contain enclosing double quotes. Something changed (newer CMake version?) so that the macro now expands as Second Life Release rather than as "Second Life Release". That leads to syntax errors when it's used. Add C++ preprocessor trickery to stringize the value of the macro.
2016-11-30DRTVWR-418: Flesh out the set of Platform_arch_Manifest classes.Nat Goodspeed
2016-11-30DRTVWR-418: VertexMap::mapped_type -> size_t: we store map.size().Nat Goodspeed
2016-11-30Pull in new version of KDU third party package that is build (correctly) as ↵Callum Prentice
a static library vs. a stub library/DLL
2016-11-30DRTVWR-418: Update forwarding_api.cpp to match current API signatureNat Goodspeed
Specifically, DriverCallback() was accepting several DWORD arguments that should really be DWORD_PTR arguments. In a 32-bit compile, evidently that was okay, but for 64 bits they're different sizes.
2016-11-29DRTVWR-418: Address yet another effect of downdating openjpeg.Nat Goodspeed
2016-11-28DRTVWR-418: Revert one more openjp2.dll reference to openjpeg.dll.Nat Goodspeed
2016-11-23DRTVWR-418: Work around missing LLCEFLibSettings::page_zoom_factor.Nat Goodspeed
2016-11-23DRTVWR-418: Have to #include "llkdumem.h" even when not LL_DARWIN.Nat Goodspeed
2016-11-22DRTVWR-418: libc++ has stat data in <sys/types.h>.Nat Goodspeed
2016-11-22DRTVWR-418: Use correct spelling for glh_linear package.Nat Goodspeed
2016-11-22DRTVWR-418: Update comments to reflect status of P0091R3.Nat Goodspeed
Some day llmake() will be unnecessary because compiler deduction of class template arguments from constructor arguments has been approved by ISO.
2016-11-22DRTVWR-418: Use uintptr_t when casting pointers to ints.Nat Goodspeed
LLPrivateMemoryPool and LLPrivateMemoryPoolManager have assumed that it's always valid to cast a pointer to U32. With 64-bit pointers, no longer true.
2016-11-19DRTVWR-418: Change to libc++ on Mac, remove reminder warning.Nat Goodspeed
2016-11-17DRTVWR-418: Provide Darwin_i686_Manifest alias to Darwin_i386_Manifest.Nat Goodspeed
It's never been clear to me why Macs tend to refer to 32-bit Intel processors as i386 when other platforms tend to refer to them as i686. New CMake logic to derive ARCH from ADDRESS_SIZE produces i686. Give viewer_manifest.py a Darwin_i686_Manifest class alias so it continues to work when arch is passed as i686 as well as i386.
2016-11-17DRTVWR-418: Fold redundant testrunner.py modules together again.Nat Goodspeed
llcorehttp/tests had a clone of llmessage/tests/testrunner.py that was almost identical save for recognizing an extra optional parameter. Migrate those few lines into llmessage/tests/testrunner.py; eliminate the copy in llcorehttp; help test_llcorehttp_peer.py find the testrunner.py in llmessage/tests.
2016-11-17DRTVWR-418: Fix Windows line endings in include_kdu_xxxx.hNat Goodspeed
2016-11-17DRTVWR-418: Add warning about changing to libc++ on Mac.Nat Goodspeed
2016-11-16DRTVWR-418: Try to make the OSX architecture match computed ARCHNat Goodspeed
which in turn depends on ADDRESS_SIZE.
2016-11-16DRTVWR-418: Disable unconditional signing for Mac builds.Nat Goodspeed
There Must Be A Better Way.
2016-11-16DRTVWR-418: Replace preprocessor tests for Windows-specific _M_AMD64Nat Goodspeed
with tests on ADDRESS_SIZE, which is now set on the compiler command line.
2016-11-16DRTVWR-418: Pass ADDRESS_SIZE down into C++ compilationNat Goodspeed
by adding -DADDRESS_SIZE= to the compile switches. Remove hack to work around limitations of gcc 4.1 build hosts. Streamline a bit of logic to specify correct -m32 or -m64 switch. Use ADDRESS_SIZE instead of ARCH to control -march=pentiumpro.
2016-11-16DRTVWR-418: Compute ADDRESS_SIZE from arch if not specified.Nat Goodspeed
Migrate the logic formerly used only for LINUX to detect whether ADDRESS_SIZE is set to 32 or 64, and if not, detect a default for the platform. But instead of using uname -m, use python's platform.machine(). On Windows, stop forcing ARCH to i686 and ADDRESS_SIZE to 32. On Mac, reset default to x86_64 instead of i386; stop forcing ADDRESS_SIZE to 32.
2016-11-16DRTVWR-418: pull in new viewer-release via viewer64Nat Goodspeed
2016-11-16Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-11-15increment viewer version to 4.1.3Oz Linden
2016-11-15DRTVWR-418: Mistakenly inverted the sense of the LL_64BIT_BUILD test.Nat Goodspeed
2016-11-15DRTVWR-418: Fold windows64 into windows platform with new autobuild.Nat Goodspeed
autobuild 1.1 now supports expanding $variables within a config file -- support that was explicitly added to address this very problem. So now the windows platform in autobuild.xml uses $AUTOBUILD_ADDRSIZE, $AUTOBUILD_WIN_VSPLATFORM and $AUTOBUILD_WIN_CMAKE_GEN, which should handle most of the deltas between the windows platform and windows64. This permits removing the windows64 platform definition from autobuild.xml. The one remaining delta between the windows64 and windows platform definitions was -DLL_64BIT_BUILD=TRUE. But we can handle that instead by checking ADDRESS_SIZE. Change all existing references to WORD_SIZE to ADDRESS_SIZE instead, and set ADDRESS_SIZE to $AUTOBUILD_ADDRSIZE. Change the one existing LL_64BIT_BUILD reference to test (ADDRESS_SIZE EQUAL 64) instead.
2016-11-08Backed out changeset: fb2eb1a59be6AndreyL ProductEngine
Reverting MAINT-6125
2016-11-08Backed out changeset: 2a56972b1571AndreyL ProductEngine
Reverting MAINT-6259
2016-11-08Backed out changeset: 27782e83386bAndreyL ProductEngine
Reverting MAINT-6793
2016-11-08MAINT-6914 Increase maximum UI size value to 4.0AndreyL ProductEngine
2016-11-03DRTVWR-418: Update KDU and llimagej2ckdu* with certain clang fixes.Nat Goodspeed
2016-11-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-10-27MAINT-6810 win10, 4k monitor and UI scale of 2.0 makes most web content too ↵pavelkproductengine
small to read
2016-10-26Backed out changeset: 5816c800a9c1AndreyL ProductEngine
Prervious MAINT-2141 fix causes MAINT-6791 so reverted it
2016-10-18MAINT-6793 Rigged mesh sometimes full of holesandreykproductengine
2016-10-18MAINT-6487 Decreasing delayandreykproductengine
2016-10-17Merged lindenlab/viewer-bear into defaultRider Linden
2016-10-17MergeRider Linden
2016-10-17MAINT-6837: forced sit error messages.Rider Linden
2016-10-18Restored MAINT-4488 (perviosly reverted in MAINT-6242)andreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 12:48:32 +0000