summaryrefslogtreecommitdiff
path: root/indra/newview/llslurl.h
AgeCommit message (Collapse)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-06-17EXT-7901 FIXED Allow clicking on http://secondlife.com/app URLs.Lynx Linden
The SLE code makes any http://<host>/app, http://<host>/region, or http://<host>/secondlife URL be treated as a SLurl rather than a normal http URL. This seems to be overly general, and has bitten us because http://secondlife.com/app is used as a redirect URL for server release notes. In the short-term, I've made an exception for hostnames that match "secondlife.com", so that the server release notes work again. In the long-term, we should assess whether treating any URL that starts with a path of "app", "region", or "secondlife" should be treated as a SLurl. What happens when google adds "http://www.google.com/app"?
2010-05-20EXT-6734 - Unable to run several copies of viewerRoxie Linden
On startup, a piece of code in llappviewer.cpp checks for the existence and validity of a slurl entered on the command line. If there is a slurl, then the slurl is sent to another instance of the viewer if one is running (for windows and linux only.) After the SLE refactor of slurls, the startup slurl was set to LAST by default. As this is a valid slurl the call to pass the slurl to another viewer was made, ignoring the codepath that checks for multiple viewer launches. The fix defaults the startup slurl to INVALID. Now, when no slurl is passed in on the command line, the code that sends the slurl to another instance is skipped and the 'multiple' flag is checked appropriately.
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-03-08DEV-45976 Last Login Location Preference not rememberedRoxie Linden
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-22Fixed normal bug EXT-4964 (Invalid SLURL detection does not detect invalid ↵Andrew Dyukov
slurls). - Added new static method LLSLURL::isValidSLURL() whic uses LLUrlRegistry::isUrl() to validate SLURLs and not just chek prefixes as LLSLURL::isSLURL() does. - Used it in slurl DnD check in LLViewerWindow. - LLUrlEntrySLURL regexp was changed not to pass non-valid SLURLS (such as one from the bug description). --HG-- branch : product-engine
2010-02-11Fix for EXT-4961 www.slurl.com will not DnD while slurl.com willCallum Prentice
Ccollab reviewed by Rick - http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=101
2010-02-03Fixed major bug EXT-4876 (Switch from slurl.com to maps.secondlife.com)Eugene Mutavchi
--HG-- branch : product-engine
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-08-26svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-14svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3 EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
2009-08-12merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0 Fixes: EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412 Other changes: Movement & Caemra controls work Profile and Me panel refactoring Notification refactoring
2009-07-09DEV-34822 - merge 1.23Roxanne Skelly
merge -r119443 - basic slurl handling ignore dead branch
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch