summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-12-11Fix linux buildRick Pasetto
2009-12-10Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-10PARTIAL DEV-43869 - add "isInterestingEnough()" to the queue calculationRick Pasetto
This change bumps the queue sizes way up, because we think that the "isInterestingEnough()" call will prevent loading more media data than we think is necessary. Still need to implement it in LLVOVolume, though
2009-12-10Fix for DEV-41388 (SNOW-307: Linux viewer builds renames gstreamer plugin to ↵Monroe Linden
quicktime.) Of the four options suggested in the jira, this is a modified version of #2. Since the mime_types.xml file actually gets localized (it contains a bunch of user-visible text in addition to the mappings), I don't think renaming it in viewer_manifest.py will work. Instead, I've created additional files (mime_types_linux.xml and mime_types_mac.xml) in the same location, and changed the code that loads the file in LLAppViewer::init() to look for different names per-platform. I'm sure there are cleverer solutions (such as abusing the translation xml overlay system to create files that have deltas per platform), but those don't fit in the time-box allocated to this issue.
2009-12-10Fix for the last case in DEV-43052.Monroe Linden
In proximity_comparitor(), if the impls have exactly the same distance, return the result of comparing the impl pointers. This will give them a completely arbitrary ordering, but it will be stable...
2009-12-10PARTIAL DEV-43869: LLMediaDataClient now uses two queuesRick Pasetto
This is a fairly major change that addresses the issue of an object with constantly-updating media. Before, that object would be put into our single queue and sorted to a particular spot, and since it continuously updates, it would "always be there". That means that nothing "behind" it would ever get serviced. This change introduces two queues for each MDC: one is the same "sorted" queue as before, and the other is unsorted, and "round-robins". New objects go into the sorted queue, objects whose media we already know about get put into the unsorted queue. The two queues are interleaved when serviced (one then the other is serviced -- if one is empty we try the other -- until they are both drained). The round-robin queue works a little differently: after an item is fetched from that queue (remember this would be an item we already know about), that request is marked and put back at the end of the queue. If that object gets a UDP update while in the queue, that mark is "cleared". When it gets to the front of the queue again, if it still marked, it is thrown away. If it is not marked, it is fetched, and again marked and put at the end. This makes the queue self-limiting in how big it can get. I have also made some other changes: - The sorting comparator now just delegates to the object for its "interest" calculation. A higher value = more interesting. LLVOVolume now uses its PixelArea for its "interest" calculation, which seems apparently better (the prior distance calculation was wrong anyway). - The score is cached before the sort operation is performed, so that it won't be expensive to sort - Now, the media version that is fetched is saved in the LLVOVolume, and we do not update if it is not newer (this is not very useful...yet.) - I've introduced hard limits (settable by debug settings) on the size of the queues. The sorted queue will be culled (after sort) to that count. NOTE: this will probably get removed in a later checkin, as I've already gotten feedback that this is not desirable - I've reorganized LLMediaDataClient so it makes more sense. - I've made the request object a little smaller, so the queue won't take up so much memory (more work could be done here) - Added a unit test for the two-queue case (though more tests are needed!)
2009-12-09Merge with headcallum
2009-12-09Bunch of simple UI changes:callum
DEV-43885 EXT-3206: Number of media items UI in Nearby Media Floater clipped when there are a lot DEV-43884 EXT-3207: In Build Dialog, Under Texture Tab, should say "Media" and not "Media URL" DEV-43877 EXT-3221: Warning message about whitelists in Security Tab of Media settings floater appears incorrectly DEV-43875 EXT-3224: Media Text Box in the Build settings: Texture should be a label and not a text box DEV-43477 Popup for adding media to only one face is misleading Reviewed by Sam
2009-12-09mergebea@american.lindenlab.com
2009-12-09Added Doxygen commentsbea@american.lindenlab.com
2009-12-09Merge media into viewer 2-0skolb
2009-12-09Follow-up to previous change: slider control should only be set when focus ↵Rick Pasetto
changes
2009-12-09Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-09Merge viewer 2-0 into mediaskolb
2009-12-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-09Reduce likelihood of indefinite wait in viewer integration tests.Nat Goodspeed
Introduce LLStartupListener to allow viewerclient-based test script to query startup state. This handles the scenario in which, by the time the test script manages to connect, the viewer already IS in STATE_STARTED. Fix ViewerSession to invoke that query before waiting for STATE_STARTED. Make that wait time out eventually to deal with "System currently logging you off, please wait 5 minutes." Timeout raises new ViewerWontLogin exception. Fix testlangs to catch ViewerWontLogin and retry a limited number of times.
2009-12-08Performance improvements for the nearby media floater when lots of media is ↵Monroe Linden
present. Added LLViewerMediaImpl::mInNearbyMediaList for LLFloaterNearbyMedia::refreshList() to use to keep track of which elements it's seen -- this allows us to remove a linear search in an inner loop. Added a map from texture ID to media impl pointer in LLViewerMedia/LLViewerMediaImpl. This allows LLViewerMedia::getMediaImplFromTextureID() to be a std::map lookup instead of a linear search. In LLFloaterNearbyMedia, call sortByColumnIndex in postBuild instead of in addMediaItem(). The latter was causing some unnecessary re-sorting. Hf: Enter commit message. Lines beginning with 'HG:' are removed.
2009-12-08Web teams needs us to support 403 response codes for some trickery they are ↵callum
doing with Help pages.
2009-12-08MergeJames Cook
2009-12-08MergeMark Palange (Mani)
2009-12-08EXT-3158 - Removing logging of users password hash from new login code.Mark Palange (Mani)
Reviewed by Brad
2009-12-08DEV-43866: Fix mute button when you slide volume sliderRick Pasetto
Trivial fix, plus some minor refactoring
2009-12-08Merge backoutJames Cook
2009-12-08Back out EXT-2827 Unable to delete object when select face of objectJames Cook
May cause right-click delete to fail - testing that Backed out changeset: 1f8e1e73f9f4
2009-12-08Merge with Lis and Leyla' stuffJames Cook
2009-12-08EXT-3118 disabled Alerts appear to be enabled in PreferencesJames Cook
Wasn't rebuilding the list of alerts on Preferences open Cleaned up some formatting in llfloaterpreference.cpp
2009-12-08EXT-2980 Made location history menu items XML-configurableJames Cook
Reviewed with Leyla
2009-12-08Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Pardi
2009-12-08EXT-3192 Preferences > Sounds UI issuesLis Pardi
2009-12-08mergerichard
2009-12-08added fading back to icons in text widgetsrichard
2009-12-08L10N: add a helpful tooltip to the refresh icon, as done in other places in ↵Ramzi Linden
the UI
2009-12-08L10N: clarify wording in panel_group_notice accordian. Please, no more Ascii ↵Ramzi Linden
art arrows in 2.0.
2009-12-08L10N: Add much-needed linguistic context in the comments of strings.xmlRamzi Linden
2009-12-08Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Pardi
2009-12-08Re-adding references to Arrow_Up and Arrow_Down so these arrows show on ↵Lis Pardi
panel_preferences_alerts.xml
2009-12-08Capitalized the tab labels.Justin C. Rounds (Chuck)
Bonus: made them conform visually to other tabs in the side panel http://jira.secondlife.com/browse/EXT-3073
2009-12-08ext-3087 - avatar icon is truncated badlyrichard
reviewed by James
2009-12-08Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/Justin C. Rounds (Chuck)
2009-12-08Changed "Assigned Roles" to "Assigned Members".Justin C. Rounds (Chuck)
http://jira.secondlife.com/browse/EXT-3079
2009-12-08Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Pardi
2009-12-08EXT-2599 Temporary Text in filter fields should be a lighter color than User ↵Lis Pardi
typed text
2009-12-08Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/Justin C. Rounds (Chuck)
2009-12-08World > Snapshot is supposed to have separators, per the Design Spec - Top MenuRamzi Linden
L10N: use the consistent term 'Side Tray' already used elsewhere in the UI. Even if this isnt visible, it becomes part of our glossary and translation.
2009-12-08Added space between Server message output area and expand button to prevent ↵Justin C. Rounds (Chuck)
overlapping elements. http://jira.secondlife.com/browse/EXT-3116
2009-12-08L10N: use consistent terminology in tooltip for a button that does the same ↵Ramzi Linden
thing as the one in the Navigation Bar
2009-12-08mergerichard
2009-12-08mergerichard
2009-12-08L10N: the terminology 'Show Profile' is not to spec. Make this consistent ↵Ramzi Linden
to 'View Profile' used everywhere else.
2009-12-08Mergerichard