summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2009-11-17Merge of viewer2 into avpEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-11-17Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/Nyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-11-17EXT-2535 wearables saved in 2.0 don't load in 1.23Nyx (Neal Orman)
Incrementing wearable version number was a bad thing here - we want to keep all wearables reporting as version 22 until we make a breaking change. Reverted the version number and put in a hack to force any version 24 wearables to be re-saved as version 22. The hack can be removed before release, as it should only affect internal testers. Code reviewed by Seraph --HG-- branch : avatar-pipeline
2009-11-17Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-17For DEV-34652: OUTFITS (Operations) : Wear folders via drag and drop - ↵Brad Payne (Vir Linden)
handle untyped folder dragged to outfit --HG-- branch : avatar-pipeline
2009-11-18mergeRamzi Linden
2009-11-18L10N: fix a typo in a localized labelRamzi Linden
2009-11-17Removed function that was only used for debugging. Defer object suicide ↵Brad Payne (Vir Linden)
until end of the method --HG-- branch : avatar-pipeline
2009-11-18L10N: use consistent wording in strings.xml for Away/NotAway and Busy/NotBusyRamzi Linden
2009-11-18L10N: linguistic improvements to some tooltips in floater_tools.xmlRamzi Linden
2009-11-17Added gear menu for outfits panel.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-17mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-17mergeJames Cook
2009-11-17EXT-2569 : Separate out LLPanelOutfitsInventory so it's more modular versus ↵Loren Shih
being coupled with LLSidepanelAppearance EXT-2561 : Add standard bottom panel (gear menu, add button, trash icon) Added gear menu and standardized the code. (someday, will create a subclass to share the functionality across panels) Make LLPanelOutfitsInventory more modular, e.g. it no longer knows about the Wear/Edit buttons. --HG-- branch : avatar-pipeline
2009-11-17Nudge parabuildJames Cook
2009-11-17magickal newline to unbreak linux.Tofu Linden
2009-11-17Sidepanel Appearance refactoring. Work in progress.Loren Shih
1. Changed sidepanel names to have "sidepanel" (e.g. panel_appearance -> sidepanel_appearance) 2. Changed some "Looks" names to "Outfits" 3. Changed LLPanelLooks to LLPanelOutfitsInventory (to match other inventory panel naming) 4. Took out tab from sidepanel_appearance. --HG-- branch : avatar-pipeline
2009-11-17Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-17Deferring work to idle time to avoid recursive notifyObservers calls - added ↵Brad Payne (Vir Linden)
wrapper class to defer an arbitrary boost::bind or other callable --HG-- branch : avatar-pipeline
2009-11-17Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-17undo the changes for LLStyle params; add sizeFromFont in LLFontGL ; use ↵angela
font.style, font.name and font.size params for font creating
2009-11-16Allow UI tooltips and "ambient inspector" tips to have different text colorsJames Cook
2009-11-16Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0James Cook
2009-11-16EXT-1546 Don't show inspector (i) icon in empty groups list.James Cook
Apparently some name lists have placeholder items at the top, so don't show the inspector icon unless there is a valid UUID.
2009-11-16Automated merge with ssh://hg.lindenlab.com/james/gooey/James Cook
2009-11-16Change tooltip text to DkGray2, more readable.James Cook
2009-11-16EXT-2537 Update IM message well arrows with actual art, style chiclets to ↵Erica
spec, EXT-2536 Remove old art from scrollbar headers, clean up layout
2009-11-16Chat Item layoutErica
2009-11-16mergerichard
2009-11-16fix for llfasttimer not appearing with tall windowsrichard
reviewed by Palmer
2009-11-16Merge with tipcallum
2009-11-16Fix for usual signed/unsigned int error from Mac developed changes..callum
2009-11-16Merge with viewer-2-0 changesMark Palange (Mani)
2009-11-17Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-16Chat Item layoutErica
2009-11-16Hopefully the final fix for DEV-42800 (white flash at login).Monroe Linden
Reinstated the hide_loading parameter to LLMediaCtrl, and made it cause LLMediaCtrl::draw() to early-exit between creating the LLViewerMediaImpl and receiving the initial MEDIA_EVENT_NAVIGATE_COMPLETE.
2009-11-16Chat Header layoutErica
2009-11-16IM Control layoutErica
2009-11-16EXT-2537 Update IM message well arrows with actual art, style chiclets to specErica
2009-11-16Made nearby media list sort on distance from avatar instead of priority.Monroe Linden
When the MediaPerformanceManagerDebug debug setting is enabled, the list will sort by priority the way it used to.
2009-11-16Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/Nyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-11-16Header file cleanup.Loren Shih
Spelling cleanup. Changed "Inventroy"->"Inventory". Removed a couple of headers from llinventory.h. --HG-- branch : avatar-pipeline
2009-11-16Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Xiaohong Bao
2009-11-16fix for DEV-2530: crash after teleporting to refion.Xiaohong Bao
2009-11-16Added MediaPerformanceManagerDebug debug setting.Monroe Linden
2009-11-16EXT-2529 Fixed viewer_manifest.py to check secondlife-bin.exe for bad ↵Mark Palange (Mani)
manifest linking. Reviewed by Palmer.
2009-11-16EXT-1068 appearance editor previews do not updateNyx (Neal Orman)
addendum: re-added changes to avatar-parameters as well as wearable parameters so that the system knows to re-update the local composite after rendering each preview. Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
2009-11-16Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Pardi
2009-11-16ext-1639 Removed Use Fullscreen check box from Preferences > GraphicsLis Pardi
2009-11-16Automated merge with ssh://hg.lindenlab.com/james/gooeyErica