Commit Graph

1486 Commits (893fc8afa71bc5b7bbdc80d8d7520352e73205cb)

Author SHA1 Message Date
callum 893fc8afa7 Merge to update new version number. 2009-10-15 15:33:32 -07:00
callum 113053b504 Fixed defects - added back getLoadedDuration() code that mysteriously vanished and fix name of function that checks the title.
See http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=19
2009-10-15 15:08:10 -07:00
callum 12628429d8 Fixed defect for URLs that already have a scheme
See http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=18
2009-10-15 14:49:27 -07:00
skolb e9f7205ba9 Merge fix for DEV-39832 2009-10-15 13:58:16 -07:00
Nat Goodspeed 050ae3cf51 Merge up to latest viewer/viewer-2-0 2009-10-15 15:43:59 -04:00
callum 3831ca912e https://jira.lindenlab.com/jira/browse/DEV-40649
Media auto refreshes after Whitelist set
This checkin fixes a related issue to this task and prohibits user from (A) adding an item to the whitelist that would invalidate the home URL and (b) adding a home URL that would not pass the whitelist.
2009-10-15 11:29:14 -07:00
callum 4347096803 https://jira.lindenlab.com/jira/browse/DEV-40711
Implement name fetching capabilities for Webkit and Quicktime plugins
Adds support for new PluginAPI message (MEDIA_EVENT_NAME_CHANGED) that updates the "title" of the media. In WebKit plugin this is the contents of the <title> tag. In The QuickTime plugin it is the "display name" from the movie meta data
2009-10-15 11:26:52 -07:00
CG Linden 47e02d13f7 Increase the .dmg setup size from 500MB to 700MB 2009-10-14 16:41:48 -07:00
skolb 1b1550f284 Merge 2009-10-14 10:10:46 -07:00
Rick Pasetto 4598a4a621 Another attempt at fixing unit test, this one is weirder.
Don't schedule the queue timer in the tick() of the retry timer.
Instead, schedule it in the RetryTimer's destructor.
This is an artifact of how the LLEventTimer's loop is handled.
2009-10-13 20:52:04 -07:00
Rick Pasetto a20933410a merge from remote repo 2009-10-13 20:23:25 -07:00
Rick Pasetto 2aff213501 Fix signature of LLError::setTagLevel() 2009-10-13 20:12:52 -07:00
Rick Pasetto 628e10b080 "Fix" unit test: you can't count on timers being scheduled to not actually also fire in the same 'pump' 2009-10-13 19:56:38 -07:00
Steve Bennetts 3f2ba601ea Setting checked in version of llviewerversion.h to 2.0.0(0) 2009-10-13 18:43:55 -07:00
Steve Bennetts 5164e8d7a3 merge 2009-10-13 17:37:14 -07:00
Steve Bennetts 3d6ae76214 merge 2009-10-13 17:16:04 -07:00
Steve Bennetts 45c1c47746 merge 2009-10-13 16:50:59 -07:00
Steve Bennetts 3d2bbe611a Made VersionChannelName not persist to reduce confusion. 2009-10-13 16:50:31 -07:00
Steve Bennetts 2b435439bb Adding debugging info to LLViewerMediaImpl::navigateTo 2009-10-13 16:48:14 -07:00
Rick Pasetto d9c1237e6f Disable boost::lexical_cast warning 2009-10-13 16:35:49 -07:00
Rick Pasetto d5c43669d5 DEV-388867, DEV-39246
Escape key cancels zoom, zoom in closer

I also refactored the code a little to be able to
experiment with more zoom levels.
Review #13
2009-10-13 14:07:19 -07:00
Rick Pasetto 630e003347 Potential fix for unit test (though I can't run it :( ) 2009-10-13 13:05:19 -07:00
Rick Pasetto 64514057a4 Merge from remote repo 2009-10-13 10:01:25 -07:00
Monroe Linden f154a3a23f Changed llmediaplugintest into a bundled app on the mac, to solve some issues around the newly-dynamic libllcommon.dylib. This includes making it set the current working directory to a known location inside its bundle on launch.
Changed indra/test_apps/llplugintest/CMakeLists.txt to copy various bits now needed inside the app bundle on the mac.
2009-10-12 19:47:39 -07:00
Rick Pasetto 780719c14c Add some more logging to help triage media client problems 2009-10-12 17:52:33 -07:00
Monroe Linden d02906b12e Added an optional "loaded_duration" parameter to the 'updated' message. This is the duration through which the time-based media has loaded, and should be between zero and the value of the "duration" parameter. If the parameter is not supplied, it will be implicitly set to the same value as the "duration" parameter, so the movie will appear fully loaded. This can be queried with LLPluginClassMedia::getLoadedDuration().
Made the "loaded_duration" parameter also implicitly set the progress percentage and send out MEDIA_EVENT_PROGRESS_UPDATED messages when it changes.

Made the quicktime plugin set the "loaded_duration" parameter in its update messages.
2009-10-12 17:21:26 -07:00
palange b5768a69b1 merge 2009-10-12 19:04:45 -04:00
palange dbe7135cc4 merge of login-api 2009-10-12 19:03:52 -04:00
Steve Bennetts 4a1ef20c31 merge 2009-10-12 13:22:58 -07:00
Rick Pasetto 0d15a29f18 Quiet MOAP logging in the viewer... 2009-10-12 11:25:51 -07:00
skolb 1d63b14548 Merge changes to llpanelmediasettingsgeneral to handle reset button 2009-10-12 11:24:14 -07:00
Rick Pasetto d4b2897700 Unit tests for LLMediaDataClient
This required a bit of refactoring of LLMediaDataClient:
- Created LLMediaDataClientObject ABC, which now has a
  concrete impl in LLVOVolume
- Created unit test with 6 tests (for now), testing
  - LLObjectMediaDataClient::fetchMedia()
  - LLObjectMediaDataClient::updateMedia()
  - LLObjectMediaNavigateClient::navigate()
  - queue ordering
  - retries
  - nav bounce back
- Also ensures that ref counting works properly (this is important, because
  ownership is tricky with smart pointers put into queues, peeled off
  into timers that fire and auto destruct, and HTTP responders that also
  auto-destruct)
- Had to fix LLCurl::Responder's stub, which was not initializing
  the ref count to 0, causing the ref counting tests to fail
  (boy, that was hard to find!).

Reviewed by Callum
2009-10-09 18:56:36 -07:00
Nat Goodspeed e3a4e3dc10 DEV-40930: Added ["change"] key to login-module status events. Changed
existing event calls to use state as "offline" or "online", with "change"
indicating the reason for this status event. Changed disconnect() to send
state "offline", change "disconnect" -- instead of replaying last auth
failure. Changed unit tests accordingly.
Changed LLLoginInstance::handleLoginEvent() to use LLEventDispatcher to route
calls to handleLoginFailure() et al.
Added LLEventDispatcher::get() to allow retrieving Callable by name and
testing for empty().
2009-10-09 19:42:59 -04:00
Monroe Linden 8d1f3f7351 Fix for some parcel media not loading properly (DEV-39135).
There were a couple of issues interacting to cause this:

Firstly, when LLViewerMediaImpl delayed loading the parcel media (which it normally does), it was losing track of the specified MIME type, but the autodiscovery code also wasn't being triggered.  The code should now carry through both the specified MIME type and the autodiscovery flag when loading is delayed.

Second, the new media autodiscovery code might not work for some legacy parcel media content (for example, if it's stored on a server that doesn't report the correct MIME types).  The code has been changed to first check whether the specified MIME type maps to a known plugin and allow that to override MIME type detection, which should allow this legacy content to keep working.
2009-10-08 19:53:55 -07:00
Nat Goodspeed a162496da9 DEV-40930: At app shutdown, clear LLModalDialog::sModalStack. Otherwise, any
modal dialog still left open will crump on destruction with LL_ERRS. If we
don't want the user to shut down the app with a modal dialog open, we should
deal with it better than a popup that simply makes us look buggy.
2009-10-08 22:48:02 -04:00
Monroe Linden bf82ec2264 Log the plugin version string when a plugin is loaded. 2009-10-08 18:42:16 -07:00
Rick Pasetto dfabf8c8c2 DEV-39056 - Fix scroll wheel on prims
the scrollEvent() API's x and y are not the same as
handleScrollWheel's x and y. The latter is the position of the mouse
at the time of the event. The former is the 'scroll amount' in x and
y, respectively. All we have for 'scroll amount' here is 'clicks', and
no mask.
2009-10-08 12:53:40 -07:00
brad kittenbrink de7c11d291 Fixups for more linux build errors post-merge. 2009-10-08 11:54:32 -07:00
brad kittenbrink 608169c1b7 Cleaned up my earlier fmodwrapper work (DEV-40872) based on nat and moss's code reviews. 2009-10-07 19:27:40 -07:00
brad kittenbrink 902d6676c6 Post-merge cleanup to get things building again. 2009-10-07 19:26:04 -07:00
brad kittenbrink 50247533f9 Merged latest viewer/login-api with latest viewer/viewer-20 2009-10-07 17:51:28 -07:00
Monroe Linden f343395f46 Don't set the nav state to MEDIANAVSTATE_NONE in response to MEDIA_EVENT_NAVIGATE_COMPLETE. Doing so was breaking the bounceback code. 2009-10-07 17:26:20 -07:00
Monroe Linden c69ead5895 Bringing in some changes from Rick. 2009-10-07 17:24:13 -07:00
brad kittenbrink 146e084af3 Merged in latest svn-imports-viewer-20 changes. 2009-10-07 16:12:56 -07:00
Richard Nelson 584d0ac64e LLFastTimer::dumpCurTimes() now gives accurate times mid-frame
reviewed by Brad
2009-10-07 21:17:28 +00:00
James Cook ec84b639ed EXT-1339 Create onClose method in LLFloater, and remove most bindings to mCloseSignal. In the vast majority of cases, mCloseSignal is being bound to an onClose function. Just make it virtual and be done with it. Renamed a couple of LLPanel close methods to onClosePanel() to distinguish them. Reviewed with Richard. 2009-10-07 20:54:31 +00:00
Rick Pasetto df48e66f7c DEV-39168 - bounce back to the current URL (or, the home URL if current URL is "") if the server denies navigation
This refactors some of the bounceBack code into LLVOVolume.
It also changes an important rule:  the edit panel now *will* send the
current URL to the server when you hit "OK".  This change was done so
that if autoplay is on, we make sure the server gets the right data.
2009-10-07 12:26:42 -07:00
Richard Nelson ec278c9dfb added LLFastTimer::dumpCurTimes
reviewed by James
2009-10-07 19:12:16 +00:00
James Cook cec5bd4bb4 EXT-1346 Inspectors - Eliminate unused Tooltip* strings from strings.xml. Not reviewed. 2009-10-07 17:24:47 +00:00
James Cook 3854656c0b Remove minimize*.tga from textures.xml to eliminate warnings on startup. Those art files no longer exist. Not reviewed. 2009-10-07 17:23:58 +00:00