Commit Graph

78 Commits (05935d09124db6834ed7262b94de7558b6738590)

Author SHA1 Message Date
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Loren Shih 5354ad68d3 VWR-25445 FIXED breasts... accordions are presented in Edit Physics floater for male avatars
Accordions are selectively hidden based on gender.
2011-04-14 16:21:49 -04:00
Loren Shih ee3048285f For SH-1308 Edit Physics sometimes messes up camera
Removed camera switching for phyics wearables.
2011-04-06 12:30:39 -04:00
Seraph Linden a47ea6c619 Added breast sway (left-right). 2011-04-03 13:56:55 -04:00
Seraph Linden cc2a813ce4 Moved Drag to be a general shape physics param, to save on number of transmitted params. 2011-04-02 18:36:49 -04:00
Seraph Linden 1b56f3c605 Fix for edit physics panel tab names. 2011-04-02 17:08:09 -04:00
Loren Shih 90b6b7e1b7 Created Advanced Physics panel.
Made a bunch of aesthetic changes to physics panel accordion.
2011-03-31 11:38:34 -04:00
Loren Shih 1ceb29bdac Change in physics parameter names.
Split some physics parameters into separate accordions based on updown/leftright.
Fixed a minor issue with physics edit tab height.
2011-03-30 23:17:58 -04:00
Loren Shih 92802e6950 Fixed some labels, and made some labels/wearables hidden in edit.
Added accordions for physics.
2011-03-29 21:56:18 -04:00
Loren Shih 3208104e2e A bit of rearchitecture so that we can have edit wearables that don't have associated snapshots. Needed to support physics wearables, which don't use a snapshot. 2011-03-29 20:57:17 -04:00
Kadah 50c9b45e99 automated merge seraph-viewer-pre-beta > firestorm 2011-04-22 17:12:21 -07:00
Loren Shih f4add6dc0d VWR-25445 FIXED breasts... accordions are presented in Edit Physics floater for male avatars
Accordions are selectively hidden based on gender.
2011-04-14 16:21:49 -04:00
Kadah 472fcabcb3 Merge avatar-physics to Firestorm 2.5.2 2011-04-14 16:33:21 -07:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Seraph Linden c287a89d54 Added breast sway (left-right). 2011-04-03 13:56:55 -04:00
Seraph Linden a0ca2c825d Moved Drag to be a general shape physics param, to save on number of transmitted params. 2011-04-02 18:36:49 -04:00
Seraph Linden e15657ae7e Fix for edit physics panel tab names. 2011-04-02 17:08:09 -04:00
Loren Shih a48fcf4e8b Created Advanced Physics panel.
Made a bunch of aesthetic changes to physics panel accordion.
2011-03-31 11:38:34 -04:00
Loren Shih 5d8d3ce3bb Change in physics parameter names.
Split some physics parameters into separate accordions based on updown/leftright.
Fixed a minor issue with physics edit tab height.
2011-03-30 23:17:58 -04:00
Loren Shih b8bef87906 Fixed some labels, and made some labels/wearables hidden in edit.
Added accordions for physics.
2011-03-29 21:56:18 -04:00
Loren Shih 4773f49afb A bit of rearchitecture so that we can have edit wearables that don't have associated snapshots. Needed to support physics wearables, which don't use a snapshot. 2011-03-29 20:57:17 -04:00
Tonya Souther 16b6f4e93c Add fudge factor when calculating avatar height. Fixes FIRE-370. 2011-01-29 09:09:20 -06:00
Oz Linden 99d4f57351 merge out from viewer-development 2011-01-21 16:37:39 -05:00
Paul Guslisty 8864a1b4db STORM-834 FIXED Color picker remains opened after 'Undo changes' button was pressed on 'Edit weareble' panel
- Close color picker after color swatch's value updated
2011-01-14 18:10:46 +02: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 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
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
Tofu Linden 44d0fd81ee (hairy) merge from viewer-release 2010-07-26 10:34:39 +01: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) 271c06363c Automated merge with ssh://nyx@hg.lindenlab.com/q/viewer-release/ 2010-07-20 15:57:19 -04:00
Nyx (Neal Orman) 2d5b917cea EXT-8119 tattoo texture remains grey until rebake
texture pipeline always returns a valid image, we needed to check the image id
against IMG_DEFAULT instead of NULL. This causes the image to be correctly set
to IMG_DEFAULT_AVATAR, which is never rendered during layer baking.

Code reviewed by Seraph
2010-07-20 15:56:37 -04:00
Richard Nelson fde4edf75d merge 2010-07-20 11:31:23 -07:00
Brad Payne (Vir Linden) 1dae91d735 EXT-8360 WIP - propagating COF item name changes various places 2010-07-19 17:15:32 -04:00
Vladimir Pchelko ef56e156ab EXT-7899 FIXED setVisible() was overridden IN LLPanelEditWearable to hide(close) LLPanelEditWearable "child" controls by calling "showWearable(mWearablePtr, FALSE);"
The problem was in LLPanelEditWearable "child" controls does not handle parent's setVisible() (for example - floater's).

--HG--
branch : product-engine
2010-07-19 12:56:53 +03:00
Brad Payne (Vir Linden) d5655c9bbf EXT-8283 FIX - allow saveWearable to change name of wearable, split off logic for saveAs case. Some remaining UI issues will be filed separately. Reviewed by Nyx 2010-07-15 13:56:46 -04:00
Vadim Savchuk 4132632cbe EXT-8254 FIXED Enabled texture/color selection when editing non-copyable clothing items.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/707/

--HG--
branch : product-engine
2010-07-07 21:02:05 +03:00
Sergei Litovchuk 4591ecc6e4 EXT-8121 FIXED Added updating type specific controls (checkboxes, radio buttons) in Edit Wearable panel upon undo action.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/702/.

--HG--
branch : product-engine
2010-07-06 22:44:28 +03:00
Leyla Farazha adc29e9b9f EXT-8030 Can't edit worn Tattoos - Texture and Color pickers won't open
EXT-8029	Edit Wearable > Skirt, Jacket, Socks - Can't open texture or color picker, texture appears as gray X
EXT-7770	Revert on shirt edit doesn't revert the fabric or color/tint icons back to their originals

fixes color swatch/texture ctrl disabled issue and "undo changes" not reverting textures on avatar
does not fix grey tattoo preview issue
reviewed by Nyx
2010-06-28 10:21:57 -07:00
Brad Payne (Vir Linden) 84f1f65af0 merge 2010-06-24 18:01:32 -04:00
Brad Payne (Vir Linden) 6328604845 EXT-7932 FIX - reviewed by Nyx 2010-06-24 17:52:40 -04:00
Tofu Linden 995d6b9a85 merge 2010-06-24 22:50:36 +01:00
Nyx (Neal Orman) f89bbd3baa EXT-7838 FIX - viewer 2.1 avatars look ruth-shaped to viewer-2 users
Added a third visual param group VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
to specify visual params that are user-tweakable, but should not be sent
over the network.

We should have this group *only* for new user-tweakable visual parameters
that should not be sent over the network. These should only be used for
*new* parameters that only contribute to the generation of baked textures.

Code reviewed by Richard
2010-06-24 17:21:18 -04:00
Mike Antipov c99bfaf6ed EXT-7961 FIXED Added possibility to show label on the back button in Edit Wearables panel.
Implemented behavior:
 * Normally Back button appears narrow without label
 * When wearable is changed - "Save" label is set and button gets wide. Left Border of Title is moved to the right.
   Note: "Save" label is shown without truncation in all languages, Title can be truncated with dots.
 * When changes are saved/reverted - label is removed, button shrinks, Title left border is moved to the its default place.
 * Added consistent tooltip for title (the same as a title).
 * Added tooltip for button: "Save changes if necessary and return back"

Details:
 * added getter for button's font
 * implemented derived from LLButton class for Back button to enable setting necessary label's padding in xml

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

--HG--
branch : product-engine
2010-06-24 13:16:35 +03:00
Richard Nelson 6dd35018d2 EXT-7767 FIX Outfit editor doesn't appear to have a default camera view
added some comments and cleaned up code based on review
2010-06-23 18:32:31 -07:00
Vladimir Pchelko e02b51f125 EXT-7770 FIXED Call updatePanelPickerControls to "revert" Picker controls in PanelEditWearable.
Reviewed by Neal Orman and Mike Antipov https://codereview.productengine.com/secondlife/r/619/

--HG--
branch : product-engine
2010-06-22 22:17:33 +03:00