Commit Graph

113 Commits (d5877bc365292358eb4c9b8d14d1c8a1237ca5bd)

Author SHA1 Message Date
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Nyx Linden ec525704e9 SH-4034 FIX Outfit changes broadcast without exiting appearance edit mode
Backing out MAINT-1099 fix. Added line causes us to temporarily exit and re-enter
outfit editing mode every time we edit a wearable, which has a host of unintended
consequences. Reviewed the original bug, and their fix should not have any
impact on the original bug.

Repro of the original bug does not repro, with or without the patch. The patch
causes regressions but not fixes so removing it. Will send MAINT-1099 back
to QA for verification - there is an alternate solution if this causes a regression.
2013-03-25 18:29:01 -04:00
Nyx Linden 38970de543 SH-3978 FIX Unsaved changes/save options not shown after adding new pants.
UI was incorrectly assuming that saving a wearable meant that the outfit
did not need to be saved as well. Updated panel switching to actually
check whether the outfit matches the base outfit.
2013-03-20 12:04:26 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
prep 85e993224c SH-3632:Undo change is now disabled after you save and return to the edit out fit panel (this behavior is now make sunshine-internal consistent with 3.4.1) 2013-01-14 17:21:13 -05:00
prep 547f48eabe SH-3600. Undo change is disabled upon reentry into the appearance panel 2013-01-09 15:43:09 -05:00
prep@lindenlab.com 18ff702a99 Fix for SH-3591. 2012-12-13 16:53:38 -06:00
prep 0b896a4953 Fixes for SH-3591 & SH-3620 2012-12-12 10:32:42 -05:00
Don Kjer 85d0bcc063 Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance 2012-09-06 02:53:55 +00:00
Don Kjer c355fb98d3 Extracted texture baking system into llappearance library. 2012-09-03 06:12:50 +00:00
maxim_productengine 7f8f2d7f8a MAINT-1099 FIXED Toggle on MyOutfits panel before showing Wearable panel for new item 2012-08-16 13:03:10 +03:00
Nyx (Neal Orman) 64ad1aba30 SH-3258 WIP initial work: refactoring appearance editing mode
Added flags for appearance editing status as well as which textures we should be using at a time.

Also refactored so we are not using camera state to track appearance editing mode.

Need to add more handling for which textures we actually use.
2012-07-11 18:30:39 -04:00
Richard Linden cb865a7e13 CHUI-101 WIP Make LLFolderView general purpose
moved filtering logic to viewmodel
2012-06-27 18:56:10 -07:00
Richard Linden 379eec8841 CHUI-101 WIP Make LLFolderView general purpose
continuing fixing build errors
renamed llfoldervieweventlistener.h to llfolderviewmodel.h
2012-06-15 13:35:39 -07:00
Richard Linden 9940ca5ae7 CHUI-101 WIP Make LLFolderView general purpose
llfolderview refactornig
2012-06-15 09:44:27 -07:00
Paul ProductEngine 9d3fc5d930 EXP-1209 FIXED Sidetray removed.
- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Paul ProductEngine 3c8b0ab537 EXP-1226 FIXED (Create and register a floater for Appearance side tab)
- Added xml for a new floater Appearance and registred it in the floaterreg

- Removed side tray dependencies

- Added static helper method: LLFloaterSidePanelContainer::getPanel
2011-09-27 22:06:56 +03:00
Richard Linden e92d3dcf10 EXP-971 FIX New Direct Delivery item does not sort as most recent item in Recent Tab if that tab is open when item delivered 2011-07-05 23:40:19 -07:00
Loren Shih 27f8b19040 Increased butt physics range.
Added more logic to not center camera during edit physics mode.
2011-03-30 22:16:35 -04:00
Oz Linden 99d4f57351 merge out from viewer-development 2011-01-21 16:37:39 -05:00
Vadim ProductEngine e3e1d9b4c3 STORM-715 FIXED Don't expand default ("Clothing") accordion tab when docking/undocking the Appearance SP.
There is a side effect: we don't reset the accordion when switching between sidepanels anymore.
But I guess it's ok because other sidepanels (People, Me) don't reset their state either
(e.g. if you open a group profile, then switch to My Inventory, then back to People,
the group profile will still be opened).
2011-01-11 18:55:22 +02:00
Oz Linden efa42a6aab merge up to viewer-development 2010-12-04 09:14:58 -05:00
Andrew Productengine abcb3a7306 STORM-375 FIXED Fixed resetting of opened accordion on minimizing/unminimizing Appearance floater.
The floater on minimization behaved the way consistent with Appearance panel in sidetray on visibility change.

- To let LLSidepanelAppearance::updateToVisibility() determine whether to reset state or not, "reset_accordion" field was added to LLSD that it passed to it. It's value is
different depending on where updateToVisibility() was called from. "visible" field was added to store boolean value that was passed before fix without name, but now can't be used that way.
2010-11-24 19:01:01 +02:00
Andrew Productengine 33bfe43b0c STORM-301 FIXED Fixed behaviour of camera on undocked 'My Appearance' tab minimizing.
- Added signal to LLFloater that is emitted on minimize.

- Set minimize callback for appearance tab floater in LLSideTrayTab::undock. Method from LLSidePanelAppearance that handles camera issues
is called on minimization of floater.
2010-10-11 19:32:42 +03:00
Vadim Savchuk c331607d97 STORM-185 FIXED Don't reset accordions in the Outfit Edit panel when a wearable gets worn.
The fix consists of two parts:
1. Saving/restoring scrollbar position when refreshing the clothing/attachments/bodyparts lists
   (the lists get refreshed on COF change).
2. Not resetting expanded accordion tab upon wearing an item (which was introduced with the fix of EXT-8164).

So, apart from preserving scrollbar position (which is what the bug reporter requests),
I also fixed that when you wear something, the Clothing accordion was always expanded.
2010-09-16 22:01:40 +03:00
Loren Shih 5e11016970 Fixed an issue where you go into appearance pose when editing physics if you were formerly in edit outfit.
Miscellaneous code cleanup.
2010-08-25 17:51:01 -04:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Loren Shih 2c6a9dd47e Changed "Range" to "Max Velocity"
Changed logic to reset to user params if velocity is 0.
Code cleanup.
Took out extraneous "Physics" accordions from previous implementation.
2010-08-23 17:38:31 -04:00
Loren Shih 981a43b355 Created new wearable type.
Added debug setting for disabling physics.
Added disable-multiwear and disable-camera-reset to wearabletype.
2010-08-23 16:13:10 -04:00
Loren Shih 27c855149e First pass commit for breast physics. 2010-08-23 13:36:28 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden 98870dfa24 merge from viewer-release 2010-08-12 12:53:53 +01:00
Loren Shih 7836f0fff3 EXT-8650 Can wear mutliple copies of a no-copy item via object links
- EXT-8660 Cleanup ambiguous llviewerobject::set/getItemID code

Lots of files changed, but this is mostly just a trivial function call rename.  This change is very low risk.
2010-08-11 12:34:27 -04:00
Richard Nelson 76a9c1214f merge 2010-07-30 10:07:14 -07:00
Richard Nelson 566e3969f9 deprecated LLPanel::child*() methods 2010-07-30 10:02:30 -07:00
Andrew Polunin a96f47db68 EXT-8164 FIXED (Accordions should be reset to default state after Edit Outfit panel reopening)
Now accordion on panels 'Edit Outfit', 'Editing Shape', 'Editing Hair', 'Editing Eyes', 'Editing Skin', 'Group Profile' and 'Place Profile' are reset when the panels are closed and then opened again.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/782/

--HG--
branch : product-engine
2010-07-21 19:00:57 +03:00
Nyx (Neal Orman) c0bba7e781 EXT-7993 FIX able to edit a clothing item you're not wearing
Added check on restoring appearance sidepanel to ensure you're still wearing
the wearable you're editing.

Code reviewed by Seraph
2010-07-01 18:03:08 -04:00
Richard Nelson e72b3815b3 EXT-7957 - clothing editor does not open when editing clothes
reviewed by nyx
2010-06-25 11:51:03 -07:00
Mike Antipov 08381a276d EXT-7755 ADDITIONAL FIX Fixed issues with wrong title after an outfit from the Inventory is worn, "Wear..." menu items state is made consistent with "Wear" button.
* Empty string is replaced with "Changing outfits" while changing COF;
* Fixed title to show "No Outfit" after an outfit from the Inventory is worn;
* Fixed bug with visible indicator after an empty folder is DnD from the Inventory "Clothing"
* Updated context and Gear "Wear..." menu items to take into account "isCOFChangeInProgress" state in on_enable callbacks

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/625/

--HG--
branch : product-engine
2010-06-23 15:30:48 +03:00
Mike Antipov eb973cf6b2 EXT-7755 FIXED Updated condition to not show "No Outfit" as a status when outfit is changing.
Implementation details:
 * Added flag to LLAgentWearables to determining that outfit is changing. Synchronizing it with mLoadingStartedSignal and mLoadedSignal signals.
 * Check this flag when there is no outfit set to show empty title when outfit is being changed.
 * Also updated condition to disable "Wear" button when outfit is being changed.

Additional improvements:
 * Removed reference to parent LLSidepanelAppearance from the LLPanelOutfitsInventory.
 * Now LLSidepanelAppearance is subscribed to mLoadingStartedSignal and mLoadedSignal to update its loading indicator.

Known Issue:
 * When new outfit is being worn its name is shown in title for a short moment (loading indicator is shown at this time). Then it is changed with an empty title and is shown when outfit is already worn.
If necessary it should be investigated and fixed in scope of another issue.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/593/

--HG--
branch : product-engine
2010-06-17 16:51:04 +03:00
Mike Antipov d1cb678bac Merge from default branch
--HG--
branch : product-engine
2010-06-15 11:15:51 +03:00
Leyla Farazha 76cf9e29a7 EXT-7799 My Appearance - Edit outfit positions camera to previous camera coordinates
reviewed by richard
2010-06-14 10:53:28 -07:00
Alexei Arabadji 0ec92fb1c8 EXT-7783 FIXED Provided updating outfit label in My outfits and Edit outfit panels.
1 Corrected LLAppearanceMgr::getBaseOutfitLink() method to avoid returning link in case base outfit moved to trash.
2 Hooked up LLSidepanelAppearance::refreshCurrentOutfitName() method on BOFReplaced signal.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/571/

--HG--
branch : product-engine
2010-06-14 16:12:20 +03:00