summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-28MergeBryan O'Sullivan
2009-07-28MergeBryan O'Sullivan
2009-07-28Merge with SVN trunkBryan O'Sullivan
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-27New package of xmlrpc-epi that actually links to the expat libs we ship. I ↵brad kittenbrink
have no idea how this has worked for so long.
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-24Merge with an oldish change of mineBryan O'Sullivan
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-24For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"Loren Shih
svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
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)
2009-07-22Merge of Parcel API V1 to trunk for 1.30 release. Hallelujah!Monty Brandenberg
QAR-1687 Merge request for Parcel API project for 1.30 release svn merge -r127262:127300 svn+ssh://svn/svn/linden/branches/parcel-api/merge-qar-1687-parcel-api-2 trunk
2009-07-21I18N fix: more nodes in XUI have duplicate name= parameters. This breaks ↵Ramzi Ramey
localization.
2009-07-21Merge with SVN trunkBryan O'Sullivan
2009-07-21DEV-34977 Context menu fails to open in Build mode. Product Engine ↵James Cook
implemented context menus as spawning on right-mouse-up, which interacts poorly with LLToolPie and recycled pie menu code. Changed context menu spawn to right-mouse-down, which allows click-drag-select behavior like the Mac. Eliminated unnecessary LLContextMenu::handleMouseUp and handleMouseDown methods -- these are handled in the LLMenuGL base class. Added handleRightMouseUp to LLMenuHolderGL to hide menus on right-mouse-up outside the menu. Reviewed with Richard.
2009-07-21merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r ↵Steven Bennetts
1078-1091 -> viewer-2.0.0-3
2009-07-21merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-07-20Resolve updatesNat Goodspeed
2009-07-20Letting compiler choose implicit LLSD conversions fixes fatal Linux gcc warningsNat Goodspeed
2009-07-20Add newline to end of file to placate Linux gccNat Goodspeed
2009-07-20Parabuild will upload event_host.tar.bz2 and event_host.tar.bz2 now in right ↵Palmer
place
2009-07-17DEV-35770 I18N: all <combo_box.item> are missing a name= parameter.Ramzi Ramey
I put them back, using the original name= given in version 1.23, but in some cases I just renamed long lists with "item1", "item2", etc.
2009-07-17six instances of Alpah -> AlphaAdam Moss
2009-07-17Eliminated old (stale) llinventoryview.cpp and merged changes to it into ↵Steven Bennetts
llfloaterinventory.cpp.
2009-07-16add a flag in LLImageGL to turn off calling LLImageGL::analyzeAlpha() and ↵Xiaohong Bao
LLImageGL::updatePickMask().
2009-07-16make LLViewerTextureManager::staticCastToFetchedTexture to accept NULL ↵Xiaohong Bao
pointer as input.
2009-07-16Make googlemock publicly availableChristian Goetze
2009-07-16I18N fix: some nodes in XUI have duplicate name= parameters. This breaks ↵Ramzi Ramey
localization.
2009-07-16Merged my 3 mac fixes with palmer's latest event_host_manifest.py changes.brad kittenbrink
2009-07-161st attempt at disabling ppc build on macs.brad kittenbrink
2009-07-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
merged all changes, post copy, from the following branches: linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v
2009-07-15Oops, LLNotificationsListener can't just be forward declared under gcc.brad kittenbrink
2009-07-15svn merge -r 127173:127174 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_04 Cherry-picking a change to the code that uses the copy of skins in the development tree instead of the version in the app bundle on the mac. Reviewed by James.
2009-07-15DEV-35531Palmer
Cmake changes and fixes to python script to get it to work properly Mani reviewed most of this
2009-07-15Disable SHARED_LIB_STAGING_DIR usage on systems where it's not initialized.brad kittenbrink
2009-07-15Revert rev 126736 for DEV-35109 which made location history in nav bar show ↵James Cook
all teleports instead of only those typed. viewer-2 now meets current spec, but spec is under discussion and Product Engine may be asked to reimplement something different. Merging revisions 126736-126735 of svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-15Fixed compile warnings in llmath/llrect.h. This header is now included in a ↵Martin Reddy
unit test in indra/test where warnings are treated as errors.
2009-07-15svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691Christian Goetze
Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27 QAR-1691
2009-07-15DEV-35500: Write new llmath unit testsMartin Reddy
- Added unit tests for LLRect and LLBBoxLocal in indra/test - Moved newview/LLBBox to llmath, and added unit tests for it - Removed methods in llbboxlocal.h and llbbox.h that were not actually implemented (declared in .h, but not defined in cpp) Reviewed by babbage.
2009-07-15Fixing DEV-35175 regression.Leyla Farazha
Context Windows will now spawn up if too far down, and spawn left if too far right. reviewed by James
2009-07-14Merge skinning-15 to viewer-2. Fixes include:James Cook
DEV-35175 Spawning context menu should not move mouse cursor (Note: introduces regression where menu can fall off bottom of screen, will fix shortly) DEV-35143 Modal alerts appear behind side tray DEV-35141 Landmarks image and description outside of landmarks Merging revisions 126418-126419,126726-126727,126856-126857,127010-127011,127014-127016 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-15 into G:\viewer-2.0.0-3, respecting ancestry
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-19 23:15:49 +0000