summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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-16EXT-2526 : Disable "double click to wear" on outfit foldersLoren Shih
EXT-1763 : Places - Landmarks : Unable to drop a landmark into Landamrks & FavoriteBar accordian panels Threefixes in here. (1) Simple disable of double-click. (2) Corrected typos "hierary"-> "hierarchy". (3) Now adding start folder to specialized inventory panels, so that we get the start folder's listener for drag&drop operations. --HG-- branch : avatar-pipeline
2009-11-16EXT-2527 : Allow contents of Appearance panel to be expandableLoren Shih
Changed the InventoryFilter logic slightly, so that if it's filtering by categories, it allows the contents of those categories to pass. --HG-- branch : avatar-pipeline
2009-11-16EXT-2445 appearance editor doesn't show correct previewsNyx (Neal Orman)
This system is in dire need of a rewrite, but the bug reported is fairly simple. The visual params in the avatar are no longer authoritative, the real values are stored in the wearable itself. The appearance editor was manipulating the values in the avatar object, resulting in no change. Updated the preview windows to use the parameter objects stored in the wearable. Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
2009-11-16Minor cleanup, changed inventorypanel start folder special casing keyword ↵Loren Shih
"INVENTORY" to using generic "My Inventory" keyword. --HG-- branch : avatar-pipeline
2009-11-16Header file cleanupLoren Shih
Removed unnecessary headers from llagent.cpp. Alphabetized headers in llagent.h and llagent.cpp. Trivial whitespace addition to llcallingcard.h --HG-- branch : avatar-pipeline
2009-11-16mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-13Post merge compile fixesEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-11-13Merging viewer2 changes into avp branchEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-11-13mergeLeyla Farazha
2009-11-13Backed out changeset db8e08f8ba36Leyla Farazha
adding main_view.xml change rev 4863 back
2009-11-13Fix for nearby chat toasts occluding the bottom bar.Leyla Farazha
2009-11-13mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-13Header file cleanupLoren Shih
Moved LLInventoryPanelObserver to be private to LLInventoryPanel --HG-- branch : avatar-pipeline
2009-11-13Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/Nyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-11-13EXT-2429 body parts out of sync with COFNyx (Neal Orman)
Visual param definitions weren't working properly when the wearable being loaded had fewer visual parameters than the current definition of the wearable. This occurred when you were loading wearables that had been created in older versions of the client (or from the library). Added missing parameters to mSavedVisualParamMap, and modified revertValues() to ensure that the two maps are kept fully in sync on finishing loading the wearable and when reverting the values. Code reviewed by Vir --HG-- branch : avatar-pipeline
2009-11-13Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-13Small mods based on code review feedback from JamesRick Pasetto
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-13mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-13Header file cleanupLoren Shih
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel. --HG-- branch : avatar-pipeline
2009-11-13fixing media texture image names - removing file extentionErica
2009-11-13Header file #include cleanup for llinventorymodel and llinventorypanel.Loren Shih
Removed a bunch of unnecessary header inclues. --HG-- branch : avatar-pipeline
2009-11-13Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-13For DEV-41820: Allow dragging links to Looks and Current Look: copy the ↵Brad Payne (Vir Linden)
link, wear if Current Look --HG-- branch : avatar-pipeline
2009-11-13Special-case a "401" status ("auth required") in ↵Monroe Linden
LLMimeDiscoveryResponder::error() to be treated as a mime type of "text/html" instead of a failure.
2009-11-13mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-13EXT-2482 : Newly created folders have wrong default typeLoren Shih
Removed AT_ROOT_CATEGORY and FT_ROOT_CATEGORY since those types are unused. Changed FT_CATEGORY to FT_ROOT_INVENTORY to make its purpose more clear. This change assumes that no agent inventories have category type 9 for either inventory type or folder preferred type. --HG-- branch : avatar-pipeline
2009-11-13Clear the media texture to black instead of almost-black.Monroe Linden
2009-11-13Prevent the about:blank url from the initial navigate from leaking out of ↵Monroe Linden
the webkit plugin. This should fix DEV-42766.
2009-11-13Add functionality to nearby media floater: parcel media & autoplayRick Pasetto
This change implements the enabling/disabling of parcel media, as well as setting the user's autoplay preference. I still am quite confused by this UI, so we'll need to play with it a bit to ensure it is what we want to present to users. This adds a few helpers to llviewerparcelmedia to get the name and URL of media.
2009-11-13For DEV-41818 - text change 'Goto Link' -> 'Find Original'Brad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-13mergeJames Cook
2009-11-13EXT-2491 IM text does not appear in private IMsJames Cook
2009-11-13Merge from product-engineSteve Bennetts
2009-11-13LLAppearanceManager cleanup - 2 methods renamedBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-11-13EXT-2477 minimizing while in appearance editing mode leaves a bad stateNyx (Neal Orman)
when minimizing the viewer while in appearance editing mode with unsaved changes kicks you out of appearance editing mode and leaves you unable to recover as the editor always starts itself on the shape tab. Fixed this in two ways: 1) if a wearable is dirty when the editor is opened, that is the tab that is selected. 2) the camera mode is not forcibly changed away from appearance editing mode on minimize. This only needs to happen if we are in mouselook. Code reviewed by Vir. --HG-- branch : avatar-pipeline
2009-11-13Add background to media controlsRick Pasetto
This actually required some help from James and Richard. Thanks, guys! This adds custom-drawing of a background image underneath the icons that make up the media controls in the layout stack. In order to have this work, we had to publicize API in lllayoutstack to force relayout to calculate the size. I also did another cleanup pass ("Boy Scout Rule") that squirreled away all pertinent controls into membed variables, instead of doing a getChild() every time updateShape() is called. Readjusted a bunch of components as well.
2009-11-13mergeLeyla Farazha
2009-11-13Backed out main_view.xmlLeyla Farazha
2009-11-13Backed out changeset fb21e02f8f08Leyla Farazha
2009-11-13merge.Tofu Linden
2009-11-13EXT-2428 : Wearing a look should update the "Current Look" sidepanel stringLoren Shih
Both double-clicking on an outfit to wear, and wearing an outfit from side panel, will now update the current look string. --HG-- branch : avatar-pipeline
2009-11-13set the outgoing call window's dock point in postBuild() instead of onOpen() ↵Tofu Linden
to avoid it being in the wrong place for a frame.
2009-11-13Merge to tipcallum