Commit Graph

32814 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Nat Goodspeed 2d32f4779c DEV-34837: The problem with prepackaging library headers is that changes in
different branches must be manually merged. Here I've applied the Linden patch
to boost::coroutines found in
http://svn.lindenlab.com/svn/lindenlib/trunk/boost_1_34_1/boost-coroutine-linden.patch
and rebuilt the Mac boost package.
2009-08-05 21:36:32 -04:00
brad kittenbrink 860a828639 Attemt at fixing "doubleton" problems across shared lib boundaries. Singletons now keep their SingletonInstaceData in a big global map in the llcommon module. 2009-08-05 14:58:30 -07:00
Nat Goodspeed 07129bf928 Merge recent changes 2009-08-05 16:10:15 -04:00
Nat Goodspeed 03ebc43132 DEV-34837: Remove dependency on Leopard-only /usr/local/lib/libexpat.0.1.0.dylib.
On Mac, add libexpat[.0.5.0].dylib to apr_suite package. Update
libapr-1[.0.3.7].dylib and libaprutil-1[.0.3.8].dylib with versions that
reference this expat. Make viewer_manifiest.py copy expat dylib to app bundle.
2009-08-05 16:08:17 -04:00
Steven Bennetts 936a1e36de merge -r 129526 skinning-19 -> viewer-2.0.0-3
Cherry pick a fix to enable IM windows.
2009-08-05 01:13:57 +00:00
Steven Bennetts 85f9400927 EXT-316 Enable the Viewer to generate calling cards for any agent
Added code to store agent ID in the description field of calling cards so that we can use them to store user generated contacts.
Currently enabled as a context menu for avatars (just for initial testing).
reviewed by richard
2009-08-05 01:05:39 +00:00
brad kittenbrink 47ae794060 Removed reference to deleted header file. 2009-08-04 17:48:04 -07:00
Steven Bennetts 7447454e7e Fix for a crash bug on login after clearing the cache. 2009-08-04 23:41:19 +00:00
brad kittenbrink 33cc363a68 Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup. 2009-08-04 15:34:34 -07:00
brad kittenbrink dc62495da6 Merged my big mondo merge and boost package changes with nat's DEV-34837 work. 2009-08-04 14:33:01 -07:00
brad kittenbrink 945656147c New linux packages for linux and linux64.
Combines the Boost.Coroutine changes in old login-api with the -Woverloaded-virtuals changes in viewer-2.0.0-3.
I could not verify the 64 bit build for now, as other breakage is getting in the way...
2009-08-04 14:29:30 -07:00
brad kittenbrink 4a959602c1 Fixed missing newline at end of llappviewer.cpp for linux build. 2009-08-04 14:28:08 -07:00
Nat Goodspeed 47e547fcba DEV-34837: Allow Mac SL executable to find libllcommon.dylib in app bundle's
Resources subdir without requiring user to explicitly set DYLD_LIBRARY_PATH.
Engage the SHARED_LIB_STAGING_DIR mechanism for Mac as well as Windows and
Linux so unit-test executables, too, can find libllcommon.dylib. Perform the
POST_BUILD copy of libllcommon.dylib to SHARED_LIB_STAGING_DIR everywhere but
Windows -- but make it conditional on SHARED_LIB_STAGING_DIR.
2009-08-04 13:51:50 -04:00
brad kittenbrink 134f394c25 New boost packages for windows and os x.
Combines the Boost.Coroutine changes in old login-api with the -Woverloaded-virtuals changes in viewer-2.0.0-3.
2009-08-03 18:50:35 -07:00
Richard Nelson 89434ef6e6 fix for broken build 2009-08-04 01:39:33 +00:00
Richard Nelson eb853f55c0 svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-08-04 01:12:59 +00:00
Steven Bennetts db5cda2667 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
2009-08-03 22:25:48 +00:00
brad kittenbrink d35cd27796 Merged Nat and Palmers latest build fixes with the big viewer-2.0.0-3/login-api merge work (changeset 486d51877332) 2009-08-03 09:54:44 -07:00
brad kittenbrink 84ec6b6925 Fixups for changest 486d51877332 merge. Deleting references to things that got deleted in viewer-2.0.0-3 2009-07-31 15:33:06 -07:00
brad kittenbrink ec22197240 Fixups for conflicts that got dropped in the changeset 486d51877332 merge of viewer-2.0.0-3 with login-api.
Mostly code that had been modified in viewer-2.0.0-3 that had been moved elsewhere in login-api.
2009-07-31 15:32:03 -07:00
Nat Goodspeed 0ac96fd8e6 DEV-34837: fix viewer_manifest.py to continue supporting static llcommon build 2009-07-31 16:13:46 -04:00
brad kittenbrink 4fcc4063e0 Fixups after merge for new files failing to include linden_common.h 2009-07-31 11:48:24 -07:00
Bryan O'Sullivan 3001a0f1b9 Merge with SVN trunk 2009-07-31 11:32:20 -07:00
Nat Goodspeed 4c4daedd64 Update with palmer's round 2 changes 2009-07-31 14:20:06 -04:00
Nat Goodspeed aaf870733a Update with palmer's round 1 changes 2009-07-31 14:19:44 -04:00
Palmer Truelson 9ed6c4fc76 Fix for DEV-35401 that makes the copy linux only and doesn't hurt mac build
To be reviewed by Mani
2009-07-31 11:17:00 -07:00
Xiaohong Bao 3c85899ee0 for DEV-33077 partially: don't call analyzeAlpha for media textures. 2009-07-31 17:51:39 +00:00
Nat Goodspeed 084983485f DEV-34837: update Mac apr_suite package so that each of the .dylib files
self-identifies as @executable_path/../Resources/filename. This allows the SL
executable to find it at runtime in its official place in the app bundle.
Change viewer_manifest.py to copy libllcommon.dylib, libapr*.dylib to app
bundle's Resources subdir.
2009-07-31 13:26:24 -04:00
brad kittenbrink a7efd0d8dd Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups. 2009-07-30 19:39:08 -07:00
Steven Bennetts e6240500a9 Minor change to protect against odd case where mArrowImage was NULL (unclear why it's happening, but the extra checks are not a bad thing). 2009-07-31 02:23:32 +00:00
brad kittenbrink 29607ab70e Merged my missing eventhost module error handling with palmer's linux build fixes. 2009-07-30 19:05:53 -07:00
brad kittenbrink 8d35bf28a0 DEV-36893 make missing eventhost module a non-fatal error. We now print a warning and fail gracefully. 2009-07-30 19:05:04 -07:00
palmer@eniac54.lindenlab.com 1af41b3ba7 Fixes to build on linux for DEV-35401.
Moves libllcommon.so to a staging dir for unit tests to work
and gets rid of LL_COMMON_API in forward declarations
2009-07-30 18:52:34 -07:00
Steven Bennetts b3a83059c4 Re-added volume column to panel_people.xml (lost in XUI cleanup). 2009-07-31 00:09:13 +00:00
brad kittenbrink 43cbfeb772 Merged my DEV-35406 work with nat's mac work. 2009-07-30 17:00:30 -07:00
brad kittenbrink 26817149c4 partial work on DEV-35406:crash on shutdown.
this doesn't actually fix anything yet though.
2009-07-30 16:59:45 -07:00
Steven Bennetts e97f7728a9 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 2009-07-30 23:22:41 +00:00
Nat Goodspeed 1e1a38d574 DEV-34837: Improve Mac support for LLCOMMON_LINK_SHARED.
Update Mac apr_suite package, introducing libapr-1.0.3.7.dylib and
libaprutil-1.0.3.8.dylib. We want to use dynamic APR libraries, but
libllcommon.dylib isn't allowed to depend on .so libraries: must be .dylibs
themselves.
Tweak APR.cmake to reference the aforementioned .dylibs when on Mac with
LLCOMMON_LINK_SHARED set. Eliminate some redundancy in Windows section.
For .dylibs, RunBuildTest.cmake must set DYLD_LIBRARY_PATH: LD_LIBRARY_PATH
only affects search for .so files.

PENDING:
CMake dependencies broken? With LLCOMMON_LINK_SHARED on, it seems we need to
build libllcommon.dylib explicitly before full build can succeed.
This snapshot does NOT yet copy the llcommon, apr or aprutil dylibs into the
app bundle.
2009-07-30 18:51:17 -04:00
Christian Goetze 181bf2ba8e Bump trunk version to 1.31 2009-07-30 01:19:13 +00:00
Christian Goetze 6603a2d210 Reduce job count for linux builds to something the build farm can survive 2009-07-30 01:09:49 +00:00
Mark Palange (Mani) 9021a536e5 DEV-35405 Added creation of <exe_dir>/components directory in debug builds to quell the savage llmozlib. 2009-07-29 18:06:45 -07:00
Mark Palange (Mani) 4f32c076c8 DEV-35405 Viewer manifest needed some love for supporting the debug build, but its still broke on llmozlib 2009-07-29 16:46:05 -07:00
Christian Goetze 87776b1944 svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737
effective merge: svn merge -r127126:128746 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
2009-07-29 22:16:52 +00:00
Dave Simmons 2c31217cc9 svn merge -c 128669 svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-4
Pulled all the sisa changes into trunk for QAR-1734
These changes are the same as revisions 126447:126495 from svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-2
or the one merge branch in
svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-3
2009-07-29 17:36:46 +00:00
Mark Palange (Mani) c2cd5d5e8b merge 2009-07-28 18:28:27 -07:00
Mark Palange (Mani) fe339408ce DEV-35399 - Making the server build llcommon.dll compatible.
Fixing up string escaping on calls to RunBuildTest.cmake
Also added ilasm.bat to the FindMono.cmake search
2009-07-28 18:03:28 -07:00
Bryan O'Sullivan eb0a3c9960 Merge 2009-07-28 15:18:22 -07:00
Bryan O'Sullivan 42fb701927 Merge 2009-07-28 14:52:16 -07:00
Bryan O'Sullivan b0dbc11ba7 Merge with SVN trunk 2009-07-28 14:51:26 -07:00
Nat Goodspeed 91497c40c5 Fix Linux compile problem 2009-07-28 13:46:34 -07:00