summaryrefslogtreecommitdiff
path: root/indra/newview/llloginhandler.cpp
AgeCommit message (Collapse)Author
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-03-16Automated merge from viewer/viewer-2-0Roxie Linden
2010-03-10EXT-6114: Ignore secondlife:///app/login SLapps if logged in.Lynx Linden
If you were already logged in, clicking on these SLapps would crash your viewer (crash was in experimental reg-in-client code). We now ignore these SLapps if the user is already logged in, and a one-time warning is emitted in this case.
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2009-12-04Expose window minimize and restore in LLWindow interface.James Cook
Add secondlife:///app/login/reg handler for Reg-In-Client Reviewed with Ambroff
2009-11-03Clean up login panel XML and code.James Cook
Kill dead "web based login" viewer-auth mWebLoginKey. Port over my reg-in-client code from svn, off by default. Reviewed with Ambroff.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-07-09DEV-34822 - merge 1.23Roxanne Skelly
merge -r119443 - basic slurl handling ignore dead branch
2010-02-01Merge giab-viewer-trunk 2497, general merge of moreRoxie Linden
secapi stuff as well as certificate handling stuff. Grid manager as well
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-15svn merge -r105329:105903 ↵Melinda Green
svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4