6ae0a9e2c1
svn merge -r 78408:78432 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer
...
Port these changes which have passed QA in QAR-186:
* Bumping version numbers to 1.19.0
* DEV-8872 Text in group list in profile and group notices is difficult to read
* DEV-9290 Clicking on Chat button in toolbar does not toggle chat bar
* DEV-4721 Upload symbol map files to S3
2008-01-28 23:36:41 +00:00
5a85e84dea
svn merge -r77355:77661 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer
...
Pick up one last change from a deprecated viewer branch.
2008-01-28 21:47:22 +00:00
9617ae17ce
svn merge -r 78173:78397 search-milestone2-1 for classified click-through logging for Streambase so data warehousing can figure out ROI/purchase history immediately after a teleport from an ad. DEV-9204
2008-01-24 23:26:05 +00:00
ed517c3b14
svn merge -r 77416:78126 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer_abandoned -> release
2008-01-24 21:11:28 +00:00
c48ebd889b
svn merge -r 77415:77842 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Server_abandoned -> release. Per josh\'s request, this got merged directly to release, did not go through normal lock phase. Made one minor change in the merge to avoid some silliness with the conflicts.
2008-01-24 20:34:48 +00:00
711b9749a1
DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to match the wiki [[License Substition]] standard. Commit to release OK by Josh/Jwolk.
2008-01-24 20:26:50 +00:00
9dab86f4cf
DEV-8923: info window does not pop up when transitioning from a Havok1 to Havok4 region
...
reviewed by tess
2008-01-23 01:03:39 +00:00
aa10b00027
dev-8998 xuilogin shows grid dropdown by default
2008-01-19 01:07:57 +00:00
8787690ccc
svn merge -r77476:77484 svn+ssh://svn.lindenlab.com/svn/linden/branches/sculptcopy
...
Shortcut for QAR-223 into release. Fix for DEV-8761/SEC-17 Ability to Access Sculpted Prim Textures from Database without owning actual sculpt texture, allowing for people to "steal" sculpts.
2008-01-18 19:55:25 +00:00
980d8c4599
svn merge -r 77823:77835 svn+ssh://svn.lindenlab.com/svn/linden/branches/loginxui-for-merge
...
QAR-222
2008-01-18 19:42:28 +00:00
3cb5c6864e
QAR-211: Logical merge of:
...
svn merge -r 76578:76594 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxbhear-based-on-release-r76573
svn merge -r 77016:77668 svn+ssh://svn.lindenlab.com/svn/linden/branches/scrolllist_fixes
svn merge -r 75889:75948 svn+ssh://svn.lindenlab.com/svn/linden/branches/simcrash-economy-fix
svn merge -r 77312:77356 svn+ssh://svn.lindenlab.com/svn/linden/branches/revoke-gods
plus addition to MANIFEST for revoke-gods
Actual merge:
svn merge -r 77525:77696 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-01-15-a
* QAR-177 Linux Voice Support Merge BuildMe
* QAR-197 merge of scrolllist_fixes into release for 1.19.0 (plus QAR-216 additions)
* QAR-194 simcrash-economy-fix
* QAR-201 Revoke gods added to deploy
2008-01-17 23:29:26 +00:00
9cb55b05c2
Handle SVN not being set as an environment variable.
2008-01-15 20:51:39 +00:00
159d2d471f
Make update_version_files.py look in the environment for the location of
...
the svn executable, default to "svn" is not set.
2008-01-15 19:25:06 +00:00
e4b451015e
Added workaround for popen bug in scripts/update_version_files.py
...
when executable is in a weird location...
2008-01-15 18:26:59 +00:00
e7a8acadc4
svn merge -r76807:77355 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
...
Pick up fixes made to 1.18.6 Viewer, including:
* DEV-8584 Replace "Second Life" with Channel name in viewer crash log reports
* DEV-8384 Connect button doesn't enable
* DEV-8408 Unable to edit First/last name and password fields in viewer login
* DEV-8423 VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates
* DEV-8557 Crash on login page when using Logitech LCD Keyboard
* DEV-8507 Crash reporter has no default server to send to when crashing before agent connect
* DEV-8531 viewer_manifest.py broken for 64-bit builds
* DEV-8286 German Translation of the "Release Keys" tab is incorrect
* DEV-7419 Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667)
* DEV-6851 Integrate html error page with client
2008-01-12 00:43:42 +00:00
dc2684fa1d
svn merge -r 76923:76933 svn+ssh://svn.lindenlab.com/svn/linden/branches/improved-im-for-merge --> release
...
QAR-176 merge of Improved IM into Release
2008-01-07 20:56:24 +00:00
e1d4097222
svn merge -r76651:76807 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
...
Pick up fixes for:
* DEV-7598 VWR-3829: Cursor in Logon edit boxes difficult to see
* DEV-8125 Language names need to have a consistent format in preferences drop-down
* DEV-8099 SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled
* DEV-8107 Crash when connecting to older sims in llviewerparcelmgr age verification code
* DEV-8130 Remove "Alternate Server" option from crash reporter since util.* no longer have public interfaces
* DEV-7372 VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp
Plus corrected line endings for llcrashlogger.* (there's one actual change in those files, the rest is whitespace)
2008-01-03 20:00:23 +00:00
b6e2a894f5
svn merge -r76207:76805 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server --> release
...
Pick up patches for:
* DEV-7727 Simcrash caused by bots sitting on trees
* DEV-8091 No-Copy can be circumvented by coalescing object with a Linden plant
* QAR-173 Add content negotiation to login.cgi and transform.cgi so people can log in with llsd instead of xmlrpc
2008-01-03 19:53:12 +00:00
2ec9ba8446
D'oh, try compiling before committing. (If it's any justification, CG was compiling so I could run home...)
2007-12-29 01:45:54 +00:00
d06e5e3519
svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640
...
Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-29 01:40:57 +00:00
79680891a7
svn merge -r 76394:76651 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer to pick up LLURI escaping fix and all other changes since last sync. Not reviewed.
2007-12-28 22:19:29 +00:00
9d0d9f7860
svn merge -r76302:76346 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer
...
Backport a few more fixes
2007-12-21 17:10:57 +00:00
df4d167cd1
svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
...
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-21 06:44:41 +00:00
8fde5f0d32
svn merge -r74912:76207 svn+ssh://svn/svn/linden/branches/Branch_1-18-6-Server -> release
2007-12-20 23:48:13 +00:00
6c6987e8a3
svn merge -r75015:75150 svn+ssh://svn/svn/linden/branches/security-lsl-setname --> release
...
QAR-146 Merge of fix for DEV-6375/SVC-997: llSetObjectName / Desc not properly capped.
2007-12-19 20:17:08 +00:00
7dd08303a3
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-19 00:56:59 +00:00
4d87303e78
svn merge -c 73823 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-4 --> release
...
Cherry pick fix for showstopper fix: DEV-5701 / SVC-930: Prims set for sale - prices are incorrectly set when multiple prims taken to inventory and rezzed
2007-12-14 23:04:55 +00:00
9f5ec4c62c
Fix compilation error
2007-12-13 19:59:08 +00:00
b01d567a5d
EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
...
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
2007-12-07 20:27:13 +00:00
a64f283477
Switching from XML streaming to Notation streaming for new streambase logging format.
2007-12-06 23:50:17 +00:00
2c89da4c6f
EFFECTIVE MERGE: svn -r 74436:74675 svn+ssh://svn/svn/linden/branches/log-streambase-1
...
ACTUAL MERGE: svn merge -r 75220:75225 svn+ssh://svn/svn/linden/qa/log-streambase-1-merge-75217
2007-12-06 23:43:36 +00:00
0a7265b1cc
svn merge -r 75234:75235 svn+ssh://svn/svn/linden/branches/maintenance-5 into release
...
Fix for simulator crash (null pointer dereference during lldebugs)
2007-12-06 20:32:46 +00:00
9754d265eb
EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/FixGroupVotes into release
...
ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release
2007-12-06 18:18:35 +00:00
facf67ae32
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
...
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
45057e8881
removed use of typeid()
2007-12-05 18:27:07 +00:00
2a9be0445b
Result of svn merge -r74235:74242 svn+ssh://svn/svn/linden/branches/robust-pump into release
2007-12-05 01:15:45 +00:00
f8511d77a7
EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release
...
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
2007-12-04 16:46:00 +00:00
90aa2ddb2e
svn merge -r 74415:74849 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
...
Last of the fixes from 1.18.5 Viewer RC series
2007-12-03 21:41:38 +00:00
f41b7bb8df
-74901 (back out premature commit to release)
2007-12-03 19:44:04 +00:00
d5eef2d8a6
merge -r 73391:74133 maint-ui-3 -> release
2007-12-03 19:36:44 +00:00
7b7dd4e6f6
svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9a
2007-12-01 01:29:28 +00:00
5c53c187ff
Trivial change to not print an error from a library (was blocking use in CGIs). Suggested by donovan.
2007-11-30 00:53:21 +00:00
f5d50760d8
Pick up patches from 1.18.6 production branch
...
svn merge -c 74225 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74273 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74366 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74424 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74444 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -r 74473:74631 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
2007-11-28 23:12:57 +00:00
75daa12872
svn merge -r 72903:73200 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
...
Missed merge range in release r74199. Josh is an idiot.
2007-11-27 19:48:41 +00:00
ecc4b297e5
svn merge -r 74317:74381 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
2007-11-26 22:48:22 +00:00
fa098e1dee
svn merge -r74202:74317 svn+ssh://svn/svn/linden/branches/Branch_1-18-5-Viewer -> release
2007-11-22 02:21:15 +00:00
25dbf0c567
DEV-6323 All menu hotkeys are active in login screen
2007-11-21 23:33:50 +00:00
e5057b4747
svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
2007-11-21 02:29:23 +00:00
78aec043f3
svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
2007-11-21 02:10:12 +00:00
11d85dac83
world map quick fix
2007-11-21 01:54:53 +00:00
Josh Bell