95f365789f
Missed contributor for VWR-8430, DEV-18635. Putting directly in trunk as this has already been merged from featurettes.
...
Change OKed with Q (the current lockholder) prospero, and robla.
2008-12-31 17:38:28 +00:00
c52e690933
make it easer for developers to examine list output by sorting the results prior to display. DEV-25457
2008-12-29 18:55:00 +00:00
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
d182b9fb82
Revert one openal -> openal-soft replacement - reviewed by Moss
2008-12-22 18:59:09 +00:00
bf9166cb78
Carry through andrew's rename of openal to openal-soft into cmake, see if that helps
2008-12-21 20:54:07 +00:00
ce5f06ab76
Changed 'openal' to 'openal-soft' to be more correct.
...
Added a linux64 version of openal-soft for the etch build.
Not reviewed.
2008-12-19 23:59:53 +00:00
5b2f960ceb
Fixing tut related compile errors on etch:
...
(1) the LLLand class had to be forward declared in a cpp file that did not include llland.h
(2) ensure_equals(const char*, type, type) requires that type have an operator!=(type, type) defined.
(3) ensure_equals(const char*, type, type) is so overloaded that the compiler can have trouble picking the right version when it has to implicitly cast a std::string to "const char*" AND multiple valid casts exist for type --> S32, F32, etc. To solve this problem we must explicitly pass in a "const char*" instead of a std::string.
Reviewed with CG
2008-12-19 22:33:29 +00:00
796a10d8e0
Added Cmake test macros
...
Changed simulator cmake to use the new macros
2008-12-18 19:18:12 +00:00
0a5c9731fd
Result of svn merge -r105061:106057 svn+ssh://svn/svn/user/phoenix/upgrade-tut into trunk. QAR-1074
2008-12-18 01:30:09 +00:00
a8d88418ce
QAR-1075 svn merge -r106114:106224 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel-stats-merge
2008-12-18 00:39:23 +00:00
d2a2b7fd55
EGADS - last checkin to wrong branch. undone.
2008-12-16 17:48:38 +00:00
995a5bc46a
fix for coordinates, convertCoords() only works when in fullscreen window.
2008-12-16 17:46:34 +00:00
1e4c7907b5
clean up contributions.txt - seriously
2008-12-16 16:23:53 +00:00
0d43d46544
VWR-1813 was credited to the wrong contributor
2008-12-16 16:18:28 +00:00
e1d8dac25a
svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
...
Resolving QAR-1051 Merge featurettes batch #4
2008-12-15 21:21:19 +00:00
9c0dbb1233
always skip fmod shutdown, instead of just for release builds.
...
fmod shutdown has been a source of mystery crashes forEVER (go mine
svn!). I don't know why they'd be more aggressive now. butttt...
materially different code behaviour depending on build type sucks as a
policy anyway, so always skip fmod shutdown.
straight-to-trunk to unblock(?) featurettes landing.
2008-12-10 17:38:17 +00:00
14a5879c88
svn merge -r104949:105037 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-06-release-merge
...
QAR-1048: Distributed L$ Transactions > Rad Chilies 06 Indra items
2008-12-09 22:41:28 +00:00
114497a7b6
Missing contributions.txt credits
2008-12-09 19:54:55 +00:00
a889511851
Don't link the simulator with iconv.dll on Windows.
2008-12-05 23:07:19 +00:00
2db8e83bca
merge -r104755:104769 /linden/branches/deploy-refactor-6 --> trunk
2008-12-05 21:54:29 +00:00
992d2867ae
indra/cmake/APR.cmake: Fix windows simulator build so it still dymanically links with iconv.
2008-12-05 17:45:21 +00:00
189599b6ff
Merging from server/server-1.25 back to trunk.
...
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
2008-12-04 22:36:34 +00:00
fd46865a50
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
...
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-02 20:35:40 +00:00
de7d6cf4df
svn merge -r103586:104391 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-4-sandbox-r103546
...
Picking up the following bug fixes:
DEV-19747 Flooding sim with bogus animation packets crashes sim
DEV-20978 Investigate baked avatar texture caching in simulator - ids not properly stored
DEV-5316 llsd-get .../runtime/top and "World:Region/Estate:Debug:Get Top Scripts" broken
DEV-18807 SVC-2596: Script dataserver events become permanently blocked until sim restart
DEV-19108 SVC-2616: Torus refuses to accept 180 degree texture rotation
DEV-9944 Simulator crash failing to write simstate to file .tmp.tmp
DEV-21439 Configure VFS file size via simulator.xml
2008-12-01 16:34:31 +00:00
64cb981d12
Updating version to 1.25.0. Current in 1.25 branch is 1.25.2, but there
...
are changes in that branch that haven't been merged down into release
yet. It makes more sense for things branched from release to be called
1.25 rather than 1.24 now....
2008-11-26 23:57:14 +00:00
ac68eb16a2
Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837 to 103519
2008-11-21 01:18:39 +00:00
77c108b2c4
Add an "if (EXISTS ${VIEWER_PREFIX}win_setup)" to fix open source drop
2008-11-20 19:17:30 +00:00
2a44e81675
QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
2008-11-19 23:26:29 +00:00
2d2d427158
QAR-1022 svn merge -r101843:102448 svn+ssh://svn.lindenlab.com/svn/linden/branches/opensource-drops/opensource-drops-4 -> release
2008-11-18 21:58:42 +00:00
a86aa7d8b0
QAR-963 svn merge -r101685:101752 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge
2008-11-18 21:20:05 +00:00
ba9cf4aa15
trivial followup to QAR-1016 - remove a line of zealous debugging spew.
2008-11-17 12:21:46 +00:00
a879e13055
svn merge -c102054
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015
QAR-1016 joystick+spacenav improvements MERGE
2008-11-12 20:28:24 +00:00
f89f19990c
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-11-07 17:51:03 +00:00
b2bfb128e7
Merged into release with command:
...
=================================
svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge .
QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally
QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally
QA tested: Beast, Oskar
DEV's fulfilled as part of this branch:
======================================
DEV-20842 Prevent accidental activation of DPO procs
DEV-23028 Mac build fails - link error dual inclusion
DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems
DEV-22997 Xcode project: 'server' target has no dependencies
DEV-23353 Friend request custom messages come through as an asset tag.
DEV-23309 Voice Chat Indicator does not show active voice status
DEV-23187 Can't teleport to home location
2008-11-07 00:07:44 +00:00
24ff4831f2
Fix to cmake darwin package target needed for cmake 2.6.2
2008-11-05 00:51:39 +00:00
091962408e
* Added del_empty_estates.py script.
...
* Shifted common code for copy_bans.py and del_empty_estates.py into the indra library.
* Documented copy_bans.py and del_empty_estates.py.
* Added iter_chunks generator to a new module: indra.util.iterators.
* Added unit tests for indra.util.iterators.
2008-11-04 16:57:17 +00:00
6da4bc1e5d
DEV-21940 - Add five new dev grids to the viewer login panel. bharati, chandra, danu, parvati and skanda.
2008-11-03 05:02:02 +00:00
b3f8a04823
Fix more silly printf crasher holes
2008-10-31 18:51:42 +00:00
f358e320ce
Fix nasty printf argument error
2008-10-31 18:47:46 +00:00
c4d32870e1
Fix heinous traceback if commands are not found
2008-10-31 18:23:00 +00:00
d6d286775d
Windows build: only run vstool.exe once per build type.
...
Reviewed by Mani.
2008-10-30 19:57:37 +00:00
4c38e5820a
When running vstool from develop.py, use the correct build type.
2008-10-30 18:53:38 +00:00
1f3e44d0e6
Added search path for Microsoft DirectX SDK (August 2008), the latest version. OK by Ambroff.
2008-10-29 07:01:11 +00:00
b406972af1
svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporating:
...
QAR-892 Windows installer that pings secondlife.com on launch
QAR-837 Six New Languages in the Installer
QAR-908 downloader-support-1 merge
2008-10-28 23:56:20 +00:00
7a9360c8bc
Allow use of Python 2.6, in case it's useful for OSS builds.
2008-10-28 23:18:16 +00:00
27b749ead6
someone added a directory to a file list in one of the prepacked libs. just ignore that use error on cleanup.
2008-10-28 16:10:56 +00:00
5243bafa57
force dos drive letters to be uppercase. Patch from Alissa Sabre. vetted through release and cmake lists.
2008-10-28 16:10:16 +00:00
9cc14df488
A bug in viewer_manifest.py was causing Linux packages to be built
...
without libapr and libaprutil. Fixed.
2008-10-23 18:48:58 +00:00
04decf22b9
Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC5 secu-fix to 1.21.6 release.
2008-10-20 22:16:40 +00:00
d0e62db34e
bump build number to 100,000. w00t.
2008-10-20 01:23:26 +00:00
Bradley Payne