Commit Graph

46 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Roxie Linden cf05f59dd9 EXT-7388 - --grid command-line argument does nothing
Fix up overriding of --loginuri --loginpage --helperuri
2010-05-27 17:20:29 -07:00
Alexei Arabadji c94653eec8 EXT-7363 FIXED Added missing conversion of SLURL parameters string to query parameters map.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/397/

--HG--
branch : product-engine
2010-05-17 16:40:08 +03: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
Tofu Linden 6d738f25d9 The 'strict' fix for EXT-6288. Stricter than the lower-risk fix which is intended for viewer 2.0. 2010-03-11 08:38:35 +00:00
Denis Serdjuk fcd34cbe8e Rolling back a previous fix EXT-5380. More convenient approach has been founded.
--HG--
branch : product-engine
2010-02-19 15:29:17 +02:00
Denis Serdjuk db3c5d214a fixed Normal bug EXT-5380 'Place Profile' side panel opens instead 'Search' floater after not-recognized SLURL was entered in Location Field
Changes:Viewer will try to open search browser, if slurl has invalid region name

--HG--
branch : product-engine
2010-02-16 19:08:18 +02:00
brad kittenbrink cb9b874b17 Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0. 2009-12-14 11:07:29 -08:00
Nat Goodspeed 19122e164c Add LL(URLDispatcher,CommandDispatcher,PanelLogin)Listener
LLURLDispatcherListener accepts requests for LLURLDispatcher.
LLCommandDispatcherListener accepts requests for LLCommandDispatcher.
LLPanelLoginListener accepts requests specifically for LLPanelLogin. Initially
it supports a simulated click to the "Log In" button.
2009-12-10 22:30:57 -05:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
James Cook 458430be91 Removed include llnotifications.h from llfloater.h trying to speed builds
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
brad kittenbrink 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
Lynx Linden daefef6e66 DEV-2925: Remove support for secondlife:///app/objectim URLs.
These are no longer generated in Viewer 2.0 (instead we use
notifications to send object IMs to the user), so there's no
need to look for them in every textbox. Users can get details
on any objects spamming them via the new remote object inspector.
2009-11-12 12:43:18 +00:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Martin Reddy 6c1706da69 DEV-41358: Remove the code for the old search interface.
This checkin deletes all of the code associated with the old XUI-based
search interface, including LLFloaterDirectory, LLPanelDir*, a global
variable event hack, and the associated XUI file. The new web-based
search interface, LLFloaterSearch, is the way of the future.

Deleted 19 files and 5,838 lines of code.
2009-10-19 13:35:10 +00:00
Adam Moss feabeb4965 DEV-35039 Viewer 2.0 Help System - Viewer Development
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
2009-09-30 17:46:31 +00:00
Martin Reddy cb926640b7 DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on the
following SLAPP URL types in an untrusted browser:

  secondlife:///app/agent/...
  secondlife:///app/group/...
  secondlife:///app/parcel/...

In order to find a compromise between supporting these commands and
security concerns over potential griefing vectors, we use a throttling
solution when these commands are issued by untrusted web browsers.
That is, we only process one command per 15 seconds.

This applies to external browsers, like Firefox, as well as the
internal SL browser.

Notably, we continue to block secondlife:///app/teleport URLs.

Reviewed by james.
2009-09-14 17:09:45 +00:00
Martin Reddy 5f4764c785 DEV-39188: clicking on unsupported secondlife:///app/ SLURLs now
brings up a notification telling you this; rather than displaying
the Place side panel with N/A information.

Now, if you click on an Event or Classified SLURL, you get this
unsupported alert (2.0 does not have side panels for these types
of assets, instead they are integrated into Search).
2009-09-14 11:49:01 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 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-08-27 19:00:18 +00:00
Steven Bennetts e97f7728a9 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 2009-07-30 23:22:41 +00:00
Roxanne Skelly 7a64aad1de DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling
ignore dead branch
2009-07-09 20:56:23 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Aaron Brashears 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
Kent Quirk 667ca55bad svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
Melinda Green e1d8dac25a svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
2008-12-15 21:21:19 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release
QAR-424
2008-04-01 17:45:04 +00:00
Josh Bell 133a7b5fe2 svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release
QAR-364 - merge of maint-ui-9
2008-03-14 19:27:38 +00:00
Josh Bell 98fd90ddd6 svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media

Sam made me do it.
2008-02-14 01:45:59 +00:00
Steven Bennetts 485c7ee0e2 merge Branch_1-19-0-Viewer -r 78432:78989 -> release
QA'd in QAR-186:
DEV-9179: Commit translated and reviewed strings from 1.19 frozen branch pull
DEV-8792 Place information teleport button hidden behind chat bar.
DEV-9374: Remove "New Account..." and "Preferences" buttons from login screen for 1.19.0
DEV-9411 -- Update required version of Quicktime library to 7.4 for 1.19.0 Viewer
DEV-9430 Viewer auth failed login screen is shown in the loginxui 1.19 viewer on failure to retrieve normal login screen - changed wording of error page
DEV-8537 Chat console appearing underneath status buttons
DEV-9283 Chatbar cant be open while in mouselook
DEV-9226 Some Dazzle? icons have sneaked into the release branch
DEV-9520 Menus and Other items minimise behind onscreen buttons
DEV-9521 Unable to ctrl and click to select in the friends list
DEV-9530 SEC-20 Exploit to force users to teleport to a location on profile open.
DEV-6833 - Mature events icon and checkbox is missing from map legend

Also:
Added vc9 project files (+ minor changes for vc9) (steve)
Modified vc project files to not include the path for flex / bison (steve)
Added marker file deletion to crash logger to stop double reporting. (cube)
2008-02-01 22:10:40 +00:00
Josh Bell 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
Josh Bell e1d4097222 svn merge -r76651:76807 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Pick up fixes for:
* DEV-7598 VWR-3829: Cursor in Logon edit boxes difficult to see
* DEV-8125 Language names need to have a consistent format in preferences drop-down
* DEV-8099 SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled
* DEV-8107 Crash when connecting to older sims in llviewerparcelmgr age verification code
* DEV-8130 Remove "Alternate Server" option from crash reporter since util.* no longer have public interfaces
* DEV-7372 VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp

Plus corrected line endings for llcrashlogger.* (there's one actual change in those files, the rest is whitespace)
2008-01-03 20:00:23 +00:00
Steven Bennetts f8511d77a7 EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
2007-12-04 16:46:00 +00:00
Steven Bennetts f41b7bb8df -74901 (back out premature commit to release) 2007-12-03 19:44:04 +00:00
Steven Bennetts d5eef2d8a6 merge -r 73391:74133 maint-ui-3 -> release 2007-12-03 19:36:44 +00:00
Josh Bell 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
Tess Chu 2f6c760624 svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7 2007-11-20 02:53:43 +00:00
Tess Chu 813b140d07 svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge 2007-11-15 22:39:12 +00:00
Tess Chu 291d99bc66 svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6 2007-11-15 19:22:19 +00:00
Josh Bell 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
Aaron Brashears 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
Tess Chu cfd17f3322 svn merge -r 70819:70853 svn+ssh://svn/svn/linden/branches/urldispatcher-for-merge 2007-10-02 22:38:38 +00:00