summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
AgeCommit message (Collapse)Author
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-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-07-14mergeDave Parks
2010-06-22EXT-7729 WIP LLWARNS: Tons of "Making dummy class..." warnings on startupRichard Linden
reviewed by Leyla
2010-06-10mergeDave Parks
2010-06-07Merge with render-pipelineDave Parks
2010-05-21EXT-6658 FIXED Fixed text overflow and truncationPaul Guslisty
- Made more vertical space between radio group and status text to avoid overlapping - Moved by 5 pixels to the left \"checkbox fullbright\" checkbox to avoid trancation - Replaced checkbox's label with TextBox to have ability to apply word_wrap for truncated label Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/430/ --HG-- branch : product-engine
2010-05-15Highlight for object cost and proper retrieval/display of prim object cost ↵Dave Parks
and linkset cost.
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-02-17merge from viewer2.Tofu Linden
2010-02-17EXT-5172 set prefs review: "Allow media to auto-play" , media setting "auto ↵angela
play" and "auto scale" to 'true' by default
2010-02-16viewer2 merge.Tofu Linden
2010-02-16EXT-5172 prefs review: Allow media to auto-play should be set by defaultangela
2010-02-11merge from viewer2 trunk.Tofu Linden
2010-02-11CID-67Tofu Linden
Checker: FORWARD_NULL Function: LLFloaterTools::updatePopup(LLCoordGL, unsigned int) File: /indra/newview/llfloatertools.cpp
2010-02-05merge from viewer2 trunk.Tofu Linden
2010-02-04This file should have gone in with a previous changeset ↵Rick Pasetto
(https://hg.lindenlab.com/viewer/viewer-2-0/changeset/dddb40b50424/)
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-19FIX EXT-4468 DEV-41991: Make selected objects "more important" when loading ↵Rick Pasetto
their media data
2010-01-13Merge.Tofu Linden
2010-01-11FIX EXT-3972: Don't put up the "multiple media" dialog just because the user ↵Rick Pasetto
doesn't have the "Select Face" tool selected.
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
We've gone back and forth on this, but we've decided that there are just too many ways to accidentally add media to multiple faces when you don't mean to. This helps in one small way: by disabling the gear icon unless all selected faces have media.
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)
following changes: 1) remove renderavatarinvisible - no longer need this debug setting 2) add showobjectrenderingcost (default:TRUE) so we can turn this feature off if necessary 3) add showdebugappearanceeditor (default:FALSE) so we can test the future appearance editor code reviewed by vir and seraph --HG-- branch : avatar-pipeline
2009-12-11Mergeskolb
2009-12-11EXT-2718 avatar render cost higher in 2.0 than in 1.23Nyx (Neal Orman)
previous fix fixed the double-counting of texture costs. resulting ARC was ~99 points higher for most avatars. This patch makes the cost shoot up again, as ARC was improperly computed in 1.23 and before. This makes the cost for an avatar increase 10 points per prim instead of per-attachment, which is how we have documented it. Also used constants to eliminate magic numbers and increased ARC limit from 1024 to 2048. Will request feedback on change from BSI:STU Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
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-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-24mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-23tweaking render cost calculations based on code review feedback.Nyx (Neal Orman)
Following commits were reviewed by vir: 3054bae2bf21 dcc420c4d3f0 05341c33f01e d9cb3bf709f8 dad4281217d3 f1d887a950ba - Nyx --HG-- branch : avatar-pipeline
2009-11-23EXT-2718 EXT-2434 avatar render cost changesNyx (Neal Orman)
Fixing a but in new ARC function where textures added 5 to the ARC for each use. Expected (and previous) behavior restored, where 5 is added to ARC for each unique texture, regardless of how many faces it is used on. Confirmed new ARC is 99 points higher than previous (20 for each body part), or 119 if avatar is wearing a skirt. Will be post-reviewed before pushing --HG-- branch : avatar-pipeline
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
data overwriting. I think the problem is that this floater's state is not updated properly when the server response comes in. This needs more thought.
2009-11-13EXT-2434 update rendering cost to reflect changes in avatar renderingNyx (Neal Orman)
finished the updates to avatar rendering cost and formalized the display of selected object render cost in the build tools floater. Both checkins reviewed by Vir.
2009-11-12EXT-2434 update avatar rendering costNyx (Neal Orman)
First crack at updating the rendering cost calculation for avatars to account for the possibility of invisible avatars. Also generalized rendering cost of attachments to be more general - added debug code to build floater will be post-reviewed
2009-11-10FIX DEV-41991: do not allow media settings panel to come up if media data is ↵Rick Pasetto
in flight Review #33 This change marks the current selection "not editable" if any objects in the selection are currently "in flight" (i.e. their media data has not been fetched yet, or is in the process of being fetched). This involved adding API to LLMediaDataClient to query whether an object is in the process of being fetched (i.e. in the queue). I've added a unit test for this new API.
2009-11-02Merge conflict resolution for previous commit.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-02EXT-1866 : Inventory Side PanelLoren Shih
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel Porting over changes from svn Inventory Panel work.
2009-10-29Implementation for DEV-40710 - adds name of media stream to floater tools ↵callum
dialog. Currently, this means <title> tag for Web page or movie meta-data name for QuickTime move.
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
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 06:15:59 +0000