e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
d72a21aca1
further UI rendering performance improvements
2010-07-30 15:17:32 -07:00
6b8fec008b
Fix build break
2010-05-28 01:03:17 -07:00
cf05f59dd9
EXT-7388 - --grid command-line argument does nothing
...
Fix up overriding of --loginuri --loginpage --helperuri
2010-05-27 17:20:29 -07:00
1f101ee2a3
EXT-7388 - --grid command-line argument does nothing
...
QAR-3119 --grid command-line argument does nothing
Made --grid specifier case insensitive.
Fixed some issues with specifying non-well-known-grids
Fixed some issues with specifying --loginuri, --loginpage and --helperuri
2010-05-27 11:52:39 -07:00
da09b1dde1
EXT-7388 - --grid command line argument doesn't do anything.
...
Grid selection code was looking up the grid by grid host id not grid label.
As SLE grids use their dns name as their lable, it worked there.
However, the beta grids use a short label.
2010-05-19 18:36:51 -07:00
75755a6751
Add missing debug grids
2010-05-18 15:56:42 -07:00
5e727964db
DEV-49332 - cryptic error message when typing in single username when logging into maingrid.
...
Needs to be changed when IE is checked in, of course.
Now we check the expected credential formats for a given grid against the
format that is typed in, and throw an error if it's invalid.
2010-04-22 15:09:34 -07:00
9fdba53b09
Show beta grids depending on a settings.xml setting. for SLE, this will be turned off. For trunk, it's turned on.
...
Also, fixed an issue with manual entry of locations into the location dropdown.
2010-04-21 00:17:58 -07:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
b11a625e6f
Automated merge with a few fixups for code review comments
2010-03-01 15:31:04 -08:00
5352954eb6
automated merge
2010-02-26 17:34:39 -08:00
78f725cb97
CID-161
...
Checker: OVERRUN_STATIC
Function: LLViewerLogin::setGridChoice(EGridInfo)
File: /indra/newview/llviewernetwork.cpp
not a bug. clarified for coverity.
2010-01-27 14:08:40 -08:00
1ea60591a9
Refactoring of llviewerprecompiledheaders.h to hopefully increase stability
...
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in
the long run this will reduce build time. Also cleaned up a lot of header
file usage to conform better to the coding standard.
reviewed by james and steve.
2009-11-13 20:33:59 -05:00
7a64aad1de
DEV-34822 - merge 1.23
...
merge -r119443 - basic slurl handling
ignore dead branch
2009-07-09 20:56:23 +00:00
9e89819d55
DEV-34822 - merge with 1.23
...
certificate notification code
-r 118191
ignore-dead-branch
2009-07-08 00:45:17 +00:00
fe71dd340a
Merge giab-viewer-trunk 2497, general merge of more
...
secapi stuff as well as certificate handling stuff.
Grid manager as well
2010-02-01 15:10:19 -08:00
dc93462991
svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
2009-05-11 20:05:46 +00:00
a4000c3744
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
2009-05-08 07:43:08 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +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
4a6bacea0f
merge viewer/viewer_1-21 94170-94770 -> release
...
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +00:00
926ea0b39a
QAR-669 1.20 Viewer RC11
...
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27 21:02:01 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
e3b97ac65b
merge release@82383 viewer-cleanup2-7-merge@82828
...
QAR-369
2008-03-20 21:41:26 +00:00
672a76d0ea
reverting premature commit at 82410.
2008-03-15 01:18:27 +00:00
04611efae8
[NOTE: This was an erroneous commit, and was reverted in the next revision]
...
QAR-369 - viewer-cleanup2-7 81916 merged into release.
2008-03-14 23:21:38 +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
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
050dad0ce3
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
2007-11-07 22:55: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
00dbacb215
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
2007-03-14 23:03:50 +00:00
b36dc36306
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-09 01:09:20 +00:00
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
71d28bdbf0
merge release@56803 release-candidate@56833
2007-01-17 23:02:00 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Tofu Linden