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
2e7c0d973e
svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6
2007-11-20 23:42:48 +00:00
5356b91754
patch to fix grid selection problem, now resetting URIs every time
2007-11-20 19:15:09 +00:00
9a85f0d0bd
Reverting accidental changes from age-verification merge (only affects vc8 build)
2007-11-20 03:42:06 +00:00
2f6c760624
svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7
2007-11-20 02:53:43 +00:00
813b140d07
svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge
2007-11-15 22:39:12 +00:00
291d99bc66
svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6
2007-11-15 19:22:19 +00:00
138bf17c3c
merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
2007-11-15 19:10:29 +00:00
c1920e3c1c
EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/maintenance-2 into release
...
ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
2007-11-09 01:56:15 +00:00
760f2ceb15
svn merge -r 72877:73187 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
...
Backport patches and translations from RC branch
2007-11-08 18:59:20 +00:00
0771e39d20
Reverting unintentional commit of indra.l
2007-11-08 00:16:19 +00:00
424af0690a
Removied viewer.h from macview_prefix.h
2007-11-07 23:15:09 +00:00
050dad0ce3
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
2007-11-07 22:55:27 +00:00
6fd04521d7
merge -r71488:71881 svn+ssh://svn.lindenlab.com/svn/linden/branches/flex-bison --> release
2007-11-05 19:51:45 +00:00
1e7917fa89
Committing viewer-auth-server into release svn merge -r72818:72835 svn+ssh://svn/svn/linden/branches/viewer-auth-server-2
2007-11-02 21:26:41 +00:00
0f00eef217
svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
...
Backport patches and translations from RC branch
2007-11-01 23:10:05 +00:00
ef0eb8dbcf
svn merge -r 72356:72879 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
...
Backport fixes from 1.18.3 Server
2007-11-01 22:23:39 +00:00
7afa8058aa
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
...
QAR-11: pair-reviewed the merge w/ Sam.
2007-11-01 22:02:35 +00:00
833e8d5c2a
svn merge -r 71403:72356 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
...
Backport of fixes from production branch. Merge verified with QAR-41
2007-10-25 22:31:09 +00:00
ca6f741982
VC8 Fixes.
2007-10-25 01:43:19 +00:00
94bcd2c47d
svn merge -r 71902:71933 svn+ssh://svn.lindenlab.com/svn/linden/branches/expire-group-voice-channels -> release. Reverted 2 changes from the merge that were useless code.
2007-10-22 18:17:47 +00:00
aa8b0cbe69
QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4
2007-10-17 22:09:27 +00:00
788c18c00d
Merge maint-viewer @ r71064
2007-10-11 19:43:20 +00:00
1b550aaec2
EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release
...
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
2007-10-11 00:28:42 +00:00
5ec8bbbe22
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
2007-10-10 00:01:43 +00:00
b3b62c3b9e
Fixed obvious typo, paired with rdw.
2007-10-08 22:40:47 +00:00
fbfd85165c
Little trick to further sweep SL-56900 under the rug. Not reviewed, I wish this were otherwise, but it needs to be committed to release so the osiris external can pick it up and I don't want to have to manually create /var/www/.python-eggs anymore.
2007-10-06 04:07:27 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
4942a7b779
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-10-04 16:31:48 +00:00
9fc7049151
This should hide the problem in SL-56900. Reviewed by Donovan.
2007-10-03 23:20:12 +00:00
7ba0214179
export source now detects the prefix rather than assigning it based on filename. fixed up some comments to match our coding standard. added ability to set default license on export which will be useful for the next source drop. SL-56607
2007-10-02 23:42:54 +00:00
75b1cc886d
svn merge -r 70080:70711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer
...
Pick up last minute patches to the viewer from 1.18.3 final release.
* Final release notes and version numbers
* SL-55123 Mac app icon missing from open source tarball (missed from previous merge?)
* SL-55121 Mac mouse cursors missing from open source tarball (missed from previous merge?)
(I believe the previous merge in this series, r70180, only committed changes inside indra. I've scrubbed the history of that range and don't see any other missing files other than the two assemblies/ patches noted above)
2007-10-02 23:31:38 +00:00
6981b3bc36
svn merge -r 69806:70964 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
...
Merge fixes applied directly to 1.18.3 for server deploy, through the sim rollout:
* Listen on the right port for the auditor, don't rely on catch-all
* Fix XMLRPC test object channel
* Various VAT fixes
* Make update_version_files more resilient
* Add class 502/510 for new datacenter
* Teleport metrics fixes
* DB schema update
2007-10-02 22:43:34 +00:00
cfd17f3322
svn merge -r 70819:70853 svn+ssh://svn/svn/linden/branches/urldispatcher-for-merge
2007-10-02 22:38:38 +00:00
9763105427
Result of svn merge -r70716:70807 svn+ssh://svn/svn/linden/branches/open-py-libs into release.
2007-09-28 23:41:17 +00:00
b089fc559a
EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release
...
** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release **
ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
2007-09-28 23:32:53 +00:00
ab8dd2b550
SL-56402 God powers failing in release branch. Change to llselectmgr.cpp in maintenance rev 68427 broke this. Reverted that patch. Paired with Don.
2007-09-28 21:16:27 +00:00
5fa5307595
Run even if server version files are not present (e.g. if we share this outside LL with a viewer source drop). Also a little bit of variable renaming to clarify what's going on, and more verbosity when requested.
2007-09-26 17:56:33 +00:00
910c792b00
svn merge -r70295:70503 svn+ssh://svn/svn/linden/branches/pylibs-freshen3
2007-09-26 14:41:36 +00:00
7f9aa65bfb
svn merge -r69926:70272 lag-meter, to pick up fixes for shrunk view, icon layout and ping time testing. QA passed by Devin.
2007-09-21 20:07:49 +00:00
99d1eb7261
James discovered a bug in the minifriends code that can be triggered when running a new viewer build with VS2005 talking to an old simulator. This change works around that problem and was reviewed by James.
2007-09-21 00:09:08 +00:00
9b9769b76e
svn merge -r 69597:70080 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
...
Merge patches made in the 1-18-3 RC iterations into the trunk.
* SL-55085 Login hangs if optional update is declined.
* SL-55123 Mac app icon missing from open source tarball
* SL-55121 Mac mouse cursors missing from open source tarball
* SL-54978 Remove duplicate code that snuck in during a patch merge
* SL-54633 VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update
* Release notes/version numbers
2007-09-20 17:51:27 +00:00
2add0e15d7
Fixing problem in credits created by the reversion of VWR-2074
...
It appears the credit for VWR-333 was part of that checkin, but the actual
code for VWR-333 was checked in earlier.
2007-09-20 05:55:02 +00:00
Josh Bell