summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingsgeneral.cpp
AgeCommit message (Collapse)Author
2023-01-12Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llagent.cpp # indra/newview/llimview.cpp # indra/newview/llimview.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmediasettingsgeneral.cpp # indra/newview/pipeline.cpp
2022-11-25SL-18101 MoaP Reset button should reset the Current URLAndrey Kleshchev
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-08-31SL-18050 FIXED Media not applied to all sides of objectMnikolenko Productengine
2022-01-15SL-16344 #2 Do not play media preview if not openedAndrey Kleshchev
2019-06-21DRTVWR-493 LLViewerMedia to singletonandreykproductengine
2017-12-06MAINT-8058 Fixed background requests on every prim editandreykproductengine
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-06-25MAINT-427 FIXED Show default (empty) texture if multiple faces with media ↵Mnikolenko ProductEngine
are selected.
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-20changed buildPanel/buildFloater to member functions buildFromFileRichard Nelson
streamlined LLUICtrlFactory's interface
2010-08-16cleaned up LLUICtrlFactory...Richard Nelson
removed redundant functionality moved buildPanel to LLPanel
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-02-16EXT-5172 prefs review: Allow media to auto-play should be set by defaultangela
2010-02-11EXT-5164 Me->My Inventory opens Inventory floater, not side panelangela
2010-02-04EXT-3144 EXT-4226: Re-employ tentative state for individual items in media ↵Rick Pasetto
settings Review #95 This change undoes some prior change that seems to not allow showing media data for multiple selection. There was all of this code put in to support displaying tentative state for media, but code was added to basically override it. Perhaps the reason was tentative state items were not ignored on apply...this change does that.
2009-12-14Fix for DEV-44045 "Update text, checkbox & layout changes for Build : Media ↵callum
Settings : Controls tab"
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-11-30Merge with tipcallum
2009-11-30Fix for DEV-41951 - reworking of whitelist so it's more usable.callum
2009-11-30DEV-43041 DEV-41648 - disable OK and Apply if the media data is the same as ↵Rick Pasetto
the initial Review #48 This change kills two birds with one stone: every frame, we check to see if the media data is the same as the one we 'initialize' with. If it is, we disable OK and Cancel. Otherwise we enable them. This makes it very difficult to set empty media data, as well as fixing the "apply button doesn't grey out" bug.
2009-11-25merge in changes from viewer-2-0, manually fixed conflict in ↵James Cook
llviewermessages.cpp
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24Removed include llnotifications.h from llfloater.h trying to speed buildsJames Cook
Fixed many other includes related to this file. Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24FIX DEV-41999: don't set home URL if "Multiple Media"Rick Pasetto
Review #44
2009-11-13Fix for DEV-42161 (LLViewerMediaImpl::navigateInternal spam when editing ↵Monroe Linden
object properties). Made LLPanelMediaSettingsGeneral::updateMediaPreview() only do a navigate when the URL actually changes.
2009-11-09FIX DEV-42093 - Make sure to navigate home if current URL is empty on "Apply"Rick Pasetto
This change gets rid of the crufty (and confusing) "apply()" functions from llpanelmediasettings*. Those functions were never being called, yet changes were being made in them. Instead, I added "preApply()" and "postApply()" to each of these panels, which the floater (who really does the "apply()"ing) now calls before and after it applies the changes to the media data.
2009-11-06FIX DEV-41587: Update current URL in draw()Rick Pasetto
The current URL is now re-fetched from the current selection. Also did some minor refactoring
2009-11-03mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-10-30Implementation for DEV-41993callum
Mutes media on preview widget in media settings/general panel
2009-10-23Main change is pointing install.xml for Windows to new version of LLQtWebKit ↵callum
that has DLLs with no manifest as per recent build change. Tweaked bookamrks for test app too. Finally, added fix for DEV-41392 (Home URL Preview should be next to the Home URL)
2009-10-22DEV-41721 - "Alt-image enabled" is not yet functional: remove from UIcallum
2009-10-16mergeMark Palange (Mani)
2009-10-16merge from latest svn/viewer-2-0 to hg/viewer-2-0Mark Palange (Mani)
2009-10-15Merge to update new version number.callum
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-14Mergeskolb
2009-10-13Reset Current URL -- to be reviewedJiao Li
2009-10-12Merge changes to llpanelmediasettingsgeneral to handle reset buttonskolb
2009-10-07Bringing in some changes from Rick.Monroe Linden
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-07DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed ↵Jiao Li
by rick
2009-10-01svn merge -r 134922:134973 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.