summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-08-05Merged in my DEV-35401 "doubleton" fix.brad kittenbrink
2009-08-05Merged my latest viewer-2.0.0-3 merge and LLLoginInstance/LLFloaterTOS ↵brad kittenbrink
fixups with Nat's mac work.
2009-08-05Fixups after the latest merge with viewer-2.0.0-3. Updated LLLoginInstance ↵brad kittenbrink
to use the new LLFloaterReg way of getting hold of floaters.
2009-08-05Attemt at fixing "doubleton" problems across shared lib boundaries. ↵brad kittenbrink
Singletons now keep their SingletonInstaceData in a big global map in the llcommon module.
2009-08-05Merge recent changesNat Goodspeed
2009-08-05DEV-34837: Remove dependency on Leopard-only ↵Nat Goodspeed
/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-04Removed reference to deleted header file.brad kittenbrink
2009-08-04Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs ↵brad kittenbrink
some post-merge cleanup.
2009-08-04Merged my big mondo merge and boost package changes with nat's DEV-34837 work.brad kittenbrink
2009-08-04Fixed missing newline at end of llappviewer.cpp for linux build.brad kittenbrink
2009-08-04DEV-34837: Allow Mac SL executable to find libllcommon.dylib in app bundle'sNat Goodspeed
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-04fix for broken buildRichard Nelson
2009-08-04svn merge -r 128442:129343 ↵Richard Nelson
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-03merge ↵Steven Bennetts
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-03Merged Nat and Palmers latest build fixes with the big ↵brad kittenbrink
viewer-2.0.0-3/login-api merge work (changeset 486d51877332)
2009-07-31Fixups for changest 486d51877332 merge. Deleting references to things that ↵brad kittenbrink
got deleted in viewer-2.0.0-3
2009-07-31Fixups for conflicts that got dropped in the changeset 486d51877332 merge of ↵brad kittenbrink
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-31DEV-34837: fix viewer_manifest.py to continue supporting static llcommon buildNat Goodspeed
2009-07-31Fixups after merge for new files failing to include linden_common.hbrad kittenbrink
2009-07-31Update with palmer's round 2 changesNat Goodspeed
2009-07-31Update with palmer's round 1 changesNat Goodspeed
2009-07-31Fix for DEV-35401 that makes the copy linux only and doesn't hurt mac buildPalmer Truelson
To be reviewed by Mani
2009-07-31for DEV-33077 partially: don't call analyzeAlpha for media textures.Xiaohong Bao
2009-07-31DEV-34837: update Mac apr_suite package so that each of the .dylib filesNat Goodspeed
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-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ↵brad kittenbrink
I'll need to rebuild that, plus a couple other minor clenaups.
2009-07-31Minor change to protect against odd case where mArrowImage was NULL (unclear ↵Steven Bennetts
why it's happening, but the extra checks are not a bad thing).
2009-07-30Merged my missing eventhost module error handling with palmer's linux build ↵brad kittenbrink
fixes.
2009-07-30DEV-36893 make missing eventhost module a non-fatal error. We now print a ↵brad kittenbrink
warning and fail gracefully.
2009-07-30Fixes to build on linux for DEV-35401.palmer@eniac54.lindenlab.com
Moves libllcommon.so to a staging dir for unit tests to work and gets rid of LL_COMMON_API in forward declarations
2009-07-31Re-added volume column to panel_people.xml (lost in XUI cleanup).Steven Bennetts
2009-07-30Merged my DEV-35406 work with nat's mac work.brad kittenbrink
2009-07-30partial work on DEV-35406:crash on shutdown.brad kittenbrink
this doesn't actually fix anything yet though.
2009-07-30merge ↵Steven Bennetts
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-30DEV-34837: Improve Mac support for LLCOMMON_LINK_SHARED.Nat Goodspeed
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-29DEV-35405 Added creation of <exe_dir>/components directory in debug builds ↵Mark Palange (Mani)
to quell the savage llmozlib.
2009-07-29DEV-35405 Viewer manifest needed some love for supporting the debug build, ↵Mark Palange (Mani)
but its still broke on llmozlib
2009-07-28mergeMark Palange (Mani)
2009-07-28DEV-35399 - Making the server build llcommon.dll compatible.Mark Palange (Mani)
Fixing up string escaping on calls to RunBuildTest.cmake Also added ilasm.bat to the FindMono.cmake search
2009-07-28Fix Linux compile problemNat Goodspeed
2009-07-28DEV-35399 - Making the server build llcommon.dll compatible.Mark Palange (Mani)
Now using RunBuildTest.cmake to run tut and lscript_lsl tests, inorder to set path to llcommon.dll Exported a few llcommon apis needed by server components/tests.
2009-07-27DEV-36783 I18N: important .on_click and .on_enable widgets are missing a ↵Ramzi Ramey
name= parameter. This breaks localization. Fixed in en and fr (as 1 test case)
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ↵James Cook
for now, not complete. Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.James Cook
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
2009-07-24mergeMark Palange (Mani)
2009-07-24Adding LLLoginInstance unit test.Mark Palange (Mani)
- Added LLNotificationsInterface class. - Removed LLLoginInstance use of LLNotifications EventAPI
2009-07-24svn merge -r 127369:127511 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/landmark-permissions__merge__viewer2.0.0.3-r127280 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 includes post-merge fix for DEV-36563 : Remove mAcceptsCallingCardNames For DEV-36496 : Viewer merge for Landmark & Callingcard Permissions [VIEWER] For DEV-36563 : Remove mAcceptsCallingCardNames Test plans - EXTERNAL * [ Test against a 1.30 server ] * Test various permissions operations - both on items in inventory, and rezzed items and items that are embedded in objects. * Test creating landmarks. Test plans - INTERNAL * Test against any inventory permissions smoke tests. * See test plans in QAR-1644 for full Landmark&Callingcard Permissions test plan.
2009-07-24Merge in disabling of universal builds.Brad Kittenbrink
PPC is now oficially deprecated. svn merge -r 127807:128098 svn+ssh://svn.lindenlab.com/svn/linden/branches/brad/killppc-1
2009-07-23svn merge -r 127683:128178 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-36425 : Viewer merge for Folder Links and Types [VIEWER] Test plans - EXTERNAL * [ Test against a 1.30 server ] * Test various inventory operations -- move, copy, paste-as-link, etc. on both folders and inventory items. * Test ability to change user-created folder types. Test inventory operations on these folder types. Test plans - INTERNAL * Test against any inventory smoke tests. * See test plan in QAR-1643 for full FolderLinks&Types test plan.
2009-07-23Merged in my minor line ending and formatting changes.brad kittenbrink
2009-07-22Adding LLLoginInstance unit testMark Palange (Mani)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 20:34:19 +0000