Commit Graph

68 Commits (9c245edb37fb3d75116a53cdee17f5de5dafcdca)

Author SHA1 Message Date
Ansariel 275935b14c FIRE-20796: Grid check status page ignores opening SL links in internal browser setting 2017-01-28 13:47:35 +01:00
Nicky d7a0835432 Merge. 2016-09-26 21:12:34 +02:00
AndreyL ProductEngine 3d9c39c77c MAINT-6663 [Win LibVLC] test video buttons still appearing in search 2016-08-20 12:53:03 +03:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Nicky 3f1a78cee9 Merge with CEF tip. 2015-11-24 15:28:05 +01:00
callum_linden ec55f2cd10 MAINT-5862 Fix Provide a way for new Linux users to accept ToS 2015-11-13 16:19:16 -08:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Cinder 5a282abe18 STORM-2113 - uri parsing cleanup and fixes 2015-04-11 15:23:06 -06:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Tank_Master 22386b18b4 Merge LL 2.7.25 2015-02-24 21:22:32 -08:00
Ansariel 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
Mnikolenko ProductEngine 238eadde6d MAINT-4497 FIXED Use uriparser to find actual domain name. 2014-10-02 12:20:53 +03:00
AndreyL ProductEngine a23ec5ffa8 MAINT-4127: New default mode when clicking links: Linden links open in viewer, third-party links open in user's browser 2014-06-23 23:16:36 +03:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Cinders 2c9e821188 Rename HAS_OPENSIM_SUPPORT switch to OPENSIM 2013-02-18 21:24:20 -07:00
Oz Linden d500379cea PATH-735: Limit and clean up grid selection 2012-06-12 21:58:52 -04:00
Tank@test_master.ftrdhcpuser.net 01c7d1eafb Merge LL pathfinding
with help from Armin and NickyD
2012-08-06 18:14:39 -07:00
Armin Weatherwax 88de43718a provide SLURL_TYPE url substitution 2012-06-17 15:55:37 +02:00
Ansariel fa8e37b946 Fixed grid nick URL substitutions; Fixes avatar picker et.al. 2012-01-24 15:58:33 +01:00
Richard Linden a507fc259b finished removing remnants of media browser 2011-11-07 15:04:53 -08:00
Leslie Linden 7bc1eaf22f EXP-1342 FIX -- Update avatar picker and destination guide urls
* URL's are in place with the [GRID_LOWERCASE] used in the link to go to the
  proper page based on the grid.
* Added "GRID_LOWERCASE" substitution for URL's since it is case sensitive
2011-10-14 15:22:53 -07:00
Richard Nelson ec23ec68ea EXP-1310 FIX Profile button should open Web Profile floater
removed unused LLWeb functions for opening non-web media
moved logic inside floaters and away from auxiliary functions
2011-10-10 19:17:38 -07:00
Richard Linden feddda6740 EXP-1056 FIX Web popup issues with Web Content Browser
changed browser id back to a string so it accepts malformed uuid strings
coming from webkit - "{uuid}" instead of "uuid"
2011-07-29 16:38:07 -07:00
Richard Linden fa3f4d1166 EXP-880 FIX Enable navigation chrome for Search floater
search floater derives from floater_web_content
all web content now uses floater_web_content instead of media_browser
2011-07-12 20:58:30 -07:00
Monroe Linden dee57bea25 Merge from viewer-development. 2010-12-20 11:21:17 -08:00
callum 84a50386be SOCIAL-317 FIX LLWebContentFloater opens popups in the media browser 2010-12-02 18:46:26 -08:00
callum 522bcf17b7 SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be useful for viewer web apps 2010-11-30 20:52:30 -08:00
Monroe Linden f974a019b1 Added DisableExternalBrowser setting.
Reviewed by Callum.
2010-10-06 16:50:04 -07:00
Monroe Linden a20a98454d Fix one variant of LLWeb::loadURLExternal() not passing through the uuid to the other variant. 2010-09-20 18:02:23 -07:00
Monroe Linden 531b77a948 Enable web popups to specify size and position of the Media Browser window from javascript.
This includes a Mac build of llqtwebkit from the following sources:

revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a of http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 81ab5ae326f0 of http://hg.secondlife.com/llqtwebkit (currently head of the default branch)

Reviewed by Callum.
2010-09-15 14:39:42 -07:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Monroe Linden 25367cb33a Add support for an "_internal" target that forces a link to open in the embedded browser, regardless of the state of the "UseExternalBrowser" pref. 2010-08-18 16:58:57 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Monroe Linden d4668787ad Allow targeted links in the embedded browser to open multiple media browser windows.
Added an optional "target" parameter" to LLWeb::loadURL and loadInternal.

Made LLViewerMediaImpl::handleMediaEvent pass the target attribute of clicked links through.

Set floater_media_browser.xml to allow multiple instances.

Added LLFloaterMediaBrowser::create() and made LLFloaterMediaBrowser assume the incoming tag is the window's target, not the URL.

Reviewed by Richard at http://codereview.lindenlab.com/2641050
2010-08-05 11:16:13 -07:00
Richard Linden 68ca9dc957 VI-49 FIX "_external" links should work in shared media
monroe already did most of this, just moved dialog for confirming opening external browser to common code that calls out to external browser
so no way to skip notification unless the user opts out
2010-05-27 18:26:06 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Richard Nelson e50586043b EXT-3258 - Viewer freezes while external web browser loads page
reviewed by Callum
2010-03-29 15:28:48 -07:00
Lynx Linden f6304197a7 EXT-4882: Added firstlogin query param to Home website.
Url substitutions now support a [FIRST_LOGIN] parameter that returns
the value of gAgent.isFirstLogin(). This now gets passed to the Home
sidetray web site as a firstlogin query param.
2010-02-17 11:54:27 +00:00
Lynx Linden 6c992c95a9 EXT-3681: Send Parcel "Local ID" (S32) to web pages.
This is instead of sending the Parcel ID (LLUUID), which it turns out
the server never sends to the viewer (LLParcel::getID() always returns
NULL).
2010-02-04 10:23:24 +00:00
Lynx Linden f7120956f5 EXT-4898: Convert "en-us" to "en" for url substitutions.
The correct and general fix is to change English.lproj/language.txt.
This fix here is a more targeted and less risky fix at this stage
of the release cycle.
2010-02-04 09:21:02 +00:00
Lynx Linden e3211c4ac1 EXT-3679: Send Session, Region, and Parcel IDs to Search.
These IDs are sent as the following query parameters to the search
server: sid=, rid=, pid=, for the Session ID, Region ID, and Parcel ID
respectively.

For some reason, Parcel ID always seems to be NULL though. I'll file a
separate JIRA for that.
2009-12-23 17:14:27 +00:00
Eric M. Tulla (BigPapi) eafd52200d fix for post merge compile error (minor) 2009-12-15 16:20:17 -05:00
Eric M. Tulla (BigPapi) 08495d3f63 Merging in latest PE changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 2009-12-15 15:41:51 -05:00
Lynx Linden 870d4449f5 EXT-3441: Support various substitutions for Search URL.
The search URL is now specified in app_settings/settings.xml (instead
of in floater_search.xml), and it is now defined more flexibly with
support for various substitution strings, such as [QUERY], [AUTH_KEY],
[MATURITY], [GODLIKE], etc.

I pulled the common substitution code out into a new static method,
LLWeb::expandURLSubstitutions(). This provides support for common
strings like [VERSION], [CHANNEL], [LANGUAGE], [OS], etc. The Help and
Home sidetray code has been updated to use this new function, to avoid
replicating this behavior 3 times.

I also cleaned up the app_settings/settings.xml file and removed the
old search keys of: SearchURLDefault, SearchURLQuery, and
SearchURLSuffix2.
2009-12-15 16:00:28 +00:00