summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-10-15Merge to update new version number.callum
2009-10-15Fixed defects - added back getLoadedDuration() code that mysteriously ↵callum
vanished and fix name of function that checks the title. See http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=19
2009-10-15Fixed defect for URLs that already have a schemecallum
See http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=18
2009-10-15Merge fix for DEV-39832skolb
2009-10-15Merge up to latest viewer/viewer-2-0Nat Goodspeed
2009-10-15https://jira.lindenlab.com/jira/browse/DEV-40649callum
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-15https://jira.lindenlab.com/jira/browse/DEV-40711callum
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-14Increase the .dmg setup size from 500MB to 700MBCG Linden
2009-10-14Mergeskolb
2009-10-13Another attempt at fixing unit test, this one is weirder.Rick Pasetto
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-13merge from remote repoRick Pasetto
2009-10-13Fix signature of LLError::setTagLevel()Rick Pasetto
2009-10-13"Fix" unit test: you can't count on timers being scheduled to not actually ↵Rick Pasetto
also fire in the same 'pump'
2009-10-13Setting checked in version of llviewerversion.h to 2.0.0(0)Steve Bennetts
2009-10-13mergeSteve Bennetts
2009-10-13Made VersionChannelName not persist to reduce confusion.Steve Bennetts
2009-10-13Adding debugging info to LLViewerMediaImpl::navigateToSteve Bennetts
2009-10-13Disable boost::lexical_cast warningRick Pasetto
2009-10-13DEV-388867, DEV-39246Rick Pasetto
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-13Potential fix for unit test (though I can't run it :( )Rick Pasetto
2009-10-13Merge from remote repoRick Pasetto
2009-10-12Changed llmediaplugintest into a bundled app on the mac, to solve some ↵Monroe Linden
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-12Add some more logging to help triage media client problemsRick Pasetto
2009-10-12Added an optional "loaded_duration" parameter to the 'updated' message. ↵Monroe Linden
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-12mergepalange
2009-10-12merge of login-apipalange
2009-10-12Quiet MOAP logging in the viewer...Rick Pasetto
2009-10-12Merge changes to llpanelmediasettingsgeneral to handle reset buttonskolb
2009-10-09Unit tests for LLMediaDataClientRick Pasetto
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-09DEV-40930: Added ["change"] key to login-module status events. ChangedNat Goodspeed
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-08Fix for some parcel media not loading properly (DEV-39135).Monroe Linden
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-08DEV-40930: At app shutdown, clear LLModalDialog::sModalStack. Otherwise, anyNat Goodspeed
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-08Log the plugin version string when a plugin is loaded.Monroe Linden
2009-10-08DEV-39056 - Fix scroll wheel on primsRick Pasetto
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-08Fixups for more linux build errors post-merge.brad kittenbrink
2009-10-07Cleaned up my earlier fmodwrapper work (DEV-40872) based on nat and moss's ↵brad kittenbrink
code reviews.
2009-10-07Post-merge cleanup to get things building again.brad kittenbrink
2009-10-07Merged latest viewer/login-api with latest viewer/viewer-20brad kittenbrink
2009-10-07Don't set the nav state to MEDIANAVSTATE_NONE in response to ↵Monroe Linden
MEDIA_EVENT_NAVIGATE_COMPLETE. Doing so was breaking the bounceback code.
2009-10-07Bringing in some changes from Rick.Monroe Linden
2009-10-07Merged in latest svn-imports-viewer-20 changes.brad kittenbrink
2009-10-07LLFastTimer::dumpCurTimes() now gives accurate times mid-frameRichard Nelson
reviewed by Brad
2009-10-07EXT-1339 Create onClose method in LLFloater, and remove most bindings to ↵James Cook
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-07DEV-39168 - bounce back to the current URL (or, the home URL if current URL ↵Rick Pasetto
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-07added LLFastTimer::dumpCurTimesRichard Nelson
reviewed by James
2009-10-07EXT-1346 Inspectors - Eliminate unused Tooltip* strings from strings.xml. ↵James Cook
Not reviewed.
2009-10-07Remove minimize*.tga from textures.xml to eliminate warnings on startup. ↵James Cook
Those art files no longer exist. Not reviewed.
2009-10-07EXT-261 I18N: Labels in /character/avatar_lad.xml are not localizableJiao Li
2009-10-07DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed ↵Jiao Li
by rick
2009-10-07Removing tool icons from viewerRes.rcSteven Bennetts