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
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
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
181bf2ba8e
Bump trunk version to 1.31
2009-07-30 01:19:13 +00:00
6603a2d210
Reduce job count for linux builds to something the build farm can survive
2009-07-30 01:09:49 +00:00
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
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
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
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
c2cd5d5e8b
merge
2009-07-28 18:28:27 -07:00
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
eb0a3c9960
Merge
2009-07-28 15:18:22 -07:00
42fb701927
Merge
2009-07-28 14:52:16 -07:00
b0dbc11ba7
Merge with SVN trunk
2009-07-28 14:51:26 -07:00
91497c40c5
Fix Linux compile problem
2009-07-28 13:46:34 -07:00
b029846e81
DEV-35399 - Making the server build llcommon.dll compatible.
...
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-28 13:20:23 -07:00
935712fc5b
New package of xmlrpc-epi that actually links to the expat libs we ship. I have no idea how this has worked for so long.
2009-07-27 18:06:35 -07:00
d5aa10143a
DEV-36783 I18N: important .on_click and .on_enable widgets are missing a name= parameter. This breaks localization.
...
Fixed in en and fr (as 1 test case)
2009-07-27 22:43:43 +00:00
8f7ec64899
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window 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-27 17:56:26 +00:00
ca51e8f33d
Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
...
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
2009-07-27 16:50:01 +00:00
b47dbc2aca
Merge with an oldish change of mine
2009-07-24 15:39:56 -07:00
cc3687266f
merge
2009-07-24 15:33:45 -07:00
9538328d5f
Adding LLLoginInstance unit test.
...
- Added LLNotificationsInterface class.
- Removed LLLoginInstance use of LLNotifications EventAPI
2009-07-24 15:08:16 -07:00
f5ba6df4c2
svn merge -r 127369:127511 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-24 16:20:15 +00:00
be7e9a46db
Merge in disabling of universal builds.
...
PPC is now oficially deprecated.
svn merge -r 127807:128098 svn+ssh://svn.lindenlab.com/svn/linden/branches/brad/killppc-1
2009-07-24 01:31:53 +00:00
17b9cda432
For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"
...
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-24 00:46:26 +00:00
363de6c3bc
svn merge -r 127683:128178 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-23 23:41:12 +00:00
79ac22ac9e
Merged in my minor line ending and formatting changes.
2009-07-23 14:43:05 -07:00
db7f15df68
Adding LLLoginInstance unit test
2009-07-22 14:53:55 -07:00
858f784671
Merge of Parcel API V1 to trunk for 1.30 release. Hallelujah!
...
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-22 17:30:16 +00:00
80deb2a535
I18N fix: more nodes in XUI have duplicate name= parameters. This breaks localization.
2009-07-21 23:47:37 +00:00
90e25f6ba8
Merge with SVN trunk
2009-07-21 16:11:47 -07:00
9ad6434bb7
DEV-34977 Context menu fails to open in Build mode. Product Engine 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-21 19:00:58 +00:00
cef46d1645
merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-1091 -> viewer-2.0.0-3
2009-07-21 00:59:14 +00:00
73a97010e6
merge 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-21 00:57:23 +00:00
89dcba8b82
Resolve updates
2009-07-20 17:14:30 -07:00
105ad6d815
Letting compiler choose implicit LLSD conversions fixes fatal Linux gcc warnings
2009-07-20 17:13:05 -07:00
6128de22f4
Add newline to end of file to placate Linux gcc
2009-07-20 17:11:54 -07:00
91270a4fdc
Parabuild will upload event_host.tar.bz2 and event_host.tar.bz2 now in right place
2009-07-20 15:22:40 -07:00
dedb5be906
DEV-35770 I18N: all <combo_box.item> are missing a name= parameter.
...
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-17 23:06:53 +00:00
9ffb8addf7
six instances of Alpah -> Alpha
2009-07-17 07:32:06 +00:00
88126805c7
Eliminated old (stale) llinventoryview.cpp and merged changes to it into llfloaterinventory.cpp.
2009-07-17 01:27:44 +00:00
6a198eed3b
add a flag in LLImageGL to turn off calling LLImageGL::analyzeAlpha() and LLImageGL::updatePickMask().
2009-07-16 23:51:22 +00:00
4b1ce391d4
make LLViewerTextureManager::staticCastToFetchedTexture to accept NULL pointer as input.
2009-07-16 23:22:18 +00:00
c15b6d7d40
Make googlemock publicly available
2009-07-16 20:00:21 +00:00
e0179932d1
I18N fix: some nodes in XUI have duplicate name= parameters. This breaks localization.
2009-07-16 19:45:34 +00:00
7d6107aba3
Merged my 3 mac fixes with palmer's latest event_host_manifest.py changes.
2009-07-16 11:23:51 -07:00
ccba924dac
1st attempt at disabling ppc build on macs.
2009-07-16 11:20:16 -07:00
0274c1f2b1
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
...
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-16 17:54:58 +00:00
61c27f2663
Oops, LLNotificationsListener can't just be forward declared under gcc.
2009-07-15 17:54:11 -07:00
brad kittenbrink