summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingsgeneral.cpp
AgeCommit message (Expand)Author
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 se...Rick Pasetto
2009-12-14Fix for DEV-44045 "Update text, checkbox & layout changes for Build : Media S...callum
2009-12-09Bunch of simple UI changes:callum
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 t...Rick Pasetto
2009-11-25merge in changes from viewer-2-0, manually fixed conflict in llviewermessages...James Cook
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
2009-11-24Removed include llnotifications.h from llfloater.h trying to speed buildsJames Cook
2009-11-24FIX DEV-41999: don't set home URL if "Multiple Media"Rick Pasetto
2009-11-13Fix for DEV-42161 (LLViewerMediaImpl::navigateInternal spam when editing obje...Monroe Linden
2009-11-09FIX DEV-42093 - Make sure to navigate home if current URL is empty on "Apply"Rick Pasetto
2009-11-06FIX DEV-41587: Update current URL in draw()Rick Pasetto
2009-11-03mergeLoren Shih
2009-10-30Implementation for DEV-41993callum
2009-10-23Main change is pointing install.xml for Windows to new version of LLQtWebKit ...callum
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
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 mClo...James Cook
2009-10-07DEV-39168 - bounce back to the current URL (or, the home URL if current URL i...Rick Pasetto
2009-10-07DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed by...Jiao Li
2009-10-01svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams