summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
AgeCommit message (Expand)Author
2010-02-05merge from viewer2 trunk.Tofu Linden
2010-02-04This file should have gone in with a previous changeset (https://hg.lindenlab...Rick Pasetto
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-19FIX EXT-4468 DEV-41991: Make selected objects "more important" when loading t...Rick Pasetto
2010-01-13Merge.Tofu Linden
2010-01-11FIX EXT-3972: Don't put up the "multiple media" dialog just because the user ...Rick Pasetto
2010-01-06Merge from viewer2 trunk again - some fairly important fixes there.Tofu Linden
2010-01-05EXT-3588 Grey-out "gear" icon if not all faces selected have mediaRick Pasetto
2009-12-22Added prim cost equivalency to UI for importer and tools floater.Dave Parks
2009-12-16EXT-3514 update debug settings for new appearance featuresNyx (Neal Orman)
2009-12-11Mergeskolb
2009-12-11EXT-2718 avatar render cost higher in 2.0 than in 1.23Nyx (Neal Orman)
2009-12-09Bunch of simple UI changes:callum
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-24mergeLoren Shih
2009-11-23tweaking render cost calculations based on code review feedback.Nyx (Neal Orman)
2009-11-23EXT-2718 EXT-2434 avatar render cost changesNyx (Neal Orman)
2009-11-20Add log warning if media cap is missingRick Pasetto
2009-11-20DEV-41991 DEV-42756 : un-do the "fix" for the race condition regarding media ...Rick Pasetto
2009-11-13EXT-2434 update rendering cost to reflect changes in avatar renderingNyx (Neal Orman)
2009-11-12EXT-2434 update avatar rendering costNyx (Neal Orman)
2009-11-10FIX DEV-41991: do not allow media settings panel to come up if media data is ...Rick Pasetto
2009-11-02Merge conflict resolution for previous commit.Loren Shih
2009-11-02EXT-1866 : Inventory Side PanelLoren Shih
2009-10-29Implementation for DEV-40710 - adds name of media stream to floater tools dia...callum
2009-10-27disable media title to make it read only at all timeangela
2009-10-20media option always disabled in build toolsangela@angelas-macbook-pro.local
2009-10-16mergeMark Palange (Mani)
2009-10-15https://jira.lindenlab.com/jira/browse/DEV-40649callum
2009-10-14Merge a big bunch of fixes from maint-viewer. Hooray.Adam Moss
2009-10-13media hud url component -- to be reviewedJiao Li
2009-10-07EXT-1339 Create onClose method in LLFloater, and remove most bindings to mClo...James Cook
2009-10-07DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed by...Jiao Li
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltip...James Cook
2009-10-01svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams
2009-09-04DEV-39508 = Show Tools ("Build") menu by defaultSteven Bennetts
2009-08-29EXT-614 Object inventory does not update to show inventory created or placed ...Steven Bennetts
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-06-21merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-12-15svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featu...Melinda Green
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook