Commit Graph

11924 Commits (124bc854dd7c3dffc044f306cf836a5d6c68bd2e)

Author SHA1 Message Date
Eli Linden b4b503d4ac Merge 2010-08-04 12:52:06 -07:00
Eli Linden b3fd508cff CT-575 WIP PT translation for set16 for Viewer 2.1.1 2010-08-04 12:51:12 -07:00
Andrew Dyukov d774469aee EXT-7511 FIXED Fixed item selection cropping in Edit Outfit
Restored changeset which was lost after merge 58571b4e704b.

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/780/
2010-08-04 21:13:11 +03:00
Andrew Dyukov 7253c7eeb1 EXT-7511 FIXED Fixed item selection cropping in Edit Outfit
Restored changeset which was lost after merge 58571b4e704b.

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

--HG--
branch : product-engine
2010-08-04 21:13:11 +03:00
Xiaohong Bao aaa41211c8 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-04 11:19:39 -06:00
Christian Goetze (CG) 55e9785e7b Propagate version bump to 2.1.1 2010-08-04 10:15:15 -07:00
Christian Goetze (CG) 68bb4e3f6a Propagate version bump to 2.1.1 2010-08-04 10:14:22 -07:00
Xiaohong Bao 8f56413c91 more fix for EXT-7397: decoding textures get stuck in REQ status 2010-08-04 10:55:07 -06:00
Sergei Litovchuk 9c2694c682 Backed out changeset: b81927151a18. Fix of EXT-3981 reverted to fix EXT-4379.
--HG--
branch : product-engine
2010-08-04 19:34:55 +03:00
Paul Guslisty 00a8b68d1c Fixed erroneously unrenamed parameter name
--HG--
branch : product-engine
2010-08-06 20:25:57 +03:00
Vadim Savchuk 62466c0704 EXT-8577 WIP Context menu items for multi-attachments.
Done:
- 1. Dropped the obsolete "MultipleAttachments" setting.
- 2. Added an "Add" item to the following attachment-related context menus:
     * My Appearance (ex-My Outfits) context menu.
     * Edit Outfit -> Add More context menu.
     * Object in-world context menu.
     * Inventory context menu.
     * Object inspector gear menu.
- 3. Modified "Attach To / Attach To HUD" to perform the "add" instead of "replace" action.

TODO:
- Ability to attach multiple objects at once from the Add More panel (bulk attach).
- Make sure there's no memleak when you click Wear/Attach in the in-world object context menu
  and the callback isn't invoked (because e.g. avatar fails to get close enough to the object).

Issues:

0. I'm not sure whether LLAgentWearables::userAttachMultipleAttachments()
   should replace attachments or add them. Assumed the former.

1. I couldn't verify that adding objects from the object inspector menu works
   because I either could wear an object or see its inspector, not both.

2. > 1. Right-click on an object in your inventory and select "Wear".
   > VERIFY: Attaches the object and replaces whatever's there; asks for
   > confirmation before replacing an existing object.
   I think this is impossible to implement because we don't know in advance
   what point the object will be attached to, so we can't display a confirmation dialog.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/843/

--HG--
branch : product-engine
2010-08-06 17:14:01 +03:00
Paul Guslisty 326ad1933b EXT-8207 FIXED (Unexpected camera zoom occures if scroll location history drop-down list by mouse wheel)
Added parameter for scroll list control that determines opaque of mouse scroll wheel event. Set this parameter to \"true\" in combobox of navigation panel.

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

--HG--
branch : product-engine
2010-08-06 18:50:24 +03:00
Vadim Savchuk e6f58368aa Merge from default branch
--HG--
branch : product-engine
2010-08-06 16:40:03 +03:00
Andrew Dyukov d20e7471ad EXT-8539 FIXED Fixed title of alpha mask not save if renaming it from 'Editing' panel.
Bug happened because name change was not explicitly  listed as sufficient reason to save a wearable. So saving failed for alpha masks with only names changed.
Other wearables didn't have this problem because they passed precondition even if only name was changed thanking to checks that included visualparams.

- Made name change explicitly a sufficient reason to proceed with saving a wearable.

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

--HG--
branch : product-engine
2010-08-06 16:00:03 +03:00
Loren Shih cf58852a5e automated merge 2010-08-04 10:22:01 -04:00
Loren Shih 0f3286af36 EXT-8550 DONE Rewrite "You [ACTION] a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds." for localization
Split this into two messages to take out ACTION as requested.
2010-08-04 10:21:20 -04:00
Vadim Savchuk 06b26d0dfa EXT-8524 FIXED Non-ASCII character corruption in date.
Convert formatted date from system charset to UTF-8 on Windows (other OSes don't require this).

See http://jira.secondlife.com/browse/EXT-8318 for more details.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/834/
2010-08-04 16:52:22 +03:00
Eli Linden 6df04c142e CT-575 WIP FR translation for set16 for Viewer 2.1.1 2010-08-04 15:35:13 -07:00
Eli Linden c2636ed999 CT-575 WIP PT translation for set16 for Viewer 2.1.1 2010-08-04 12:51:12 -07:00
Vadim Savchuk 75e76ea248 EXT-8524 FIXED Non-ASCII character corruption in date.
Convert formatted date from system charset to UTF-8 on Windows (other OSes don't require this).

See http://jira.secondlife.com/browse/EXT-8318 for more details.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/834/

--HG--
branch : product-engine
2010-08-04 16:52:22 +03:00
Tofu Linden 11f4732106 EXT-8548 FIXED Login screen contains invisible field which blocks keyboard-only login
The panel_layout itself was taking focus by default (hmm).
2010-08-04 14:26:44 +01:00
Aimee Linden 80b37e50fa Merge 2010-08-04 13:19:31 +01:00
Aimee Linden fd4cbed787 DEV-52379 FIXED (Supplementary to my supplementary) Fix Linux build breakage ... oopsie. 2010-08-04 13:18:16 +01:00
Aimee Linden e77ac4ca64 Merge 2010-08-04 12:56:41 +01:00
Aimee Linden d3db9dd2a1 DEV-52379 FIXED (Supplementary) Viewer is not successfully caching object geometry
Encapsulated building of the cache filename into a help function to prevent code
 duplication.

Reviewed by Tofu.
2010-08-04 12:52:44 +01:00
Tofu Linden 0a55a522a6 merge from PE's viewer-trunk 2010-08-04 12:21:59 +01:00
Tofu Linden 4e966c1b15 merge from viewer-release 2010-08-04 12:21:34 +01:00
Tofu Linden dea1266370 merge from PE's viewer-release 2010-08-04 11:53:28 +01:00
Paul Guslisty ec06fa16ec EXT-8424 FIXED ([HARD CODED] ALL LANGS: \"More\" menu option is untranslated under Advanced menu (French viewer) > Shortcuts)
Set translated label from strings.xml

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

--HG--
branch : product-engine
2010-08-04 11:45:47 +03:00
Paul Guslisty e3a33b068d EXT-8284 FIXED ('Add More' panel items aren't sorted by clothing type after it was opened by 'Replace' item of context menu)
Restored from BAD MERGE at 5b5cc4a8642d

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

--HG--
branch : product-engine
2010-08-04 11:38:29 +03:00
Kent Quirk eefe3388da Update version to 2.1.1 2010-08-03 23:41:08 -04:00
Xiaohong Bao 08b74c369f Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-03 18:27:58 -06:00
Xiaohong Bao d4d50221e0 fix for EXT-7399: 2.0.2 with http textures loads textures slower than 1.23.5
and     EXT-7397: decoding textures get stuck in REQ status
2010-08-03 18:26:47 -06:00
Xiaohong Bao 85c970e847 fix for EXT-7399: 2.0.2 with http textures loads textures slower than 1.23.5
and     EXT-7397: decoding textures get stuck in REQ status
2010-08-03 18:26:47 -06:00
Christian Goetze (CG) a7a5a90852 Pulled build.sh change from viewer-release 2010-08-03 17:08:43 -07:00
Monroe Linden bab6e11eef New Mac build of llqtwebkit, to fix a problem with named link targets and onClickLinkHref events.
Built from the following:

revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 08e0bc3253b7 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the default branch)
2010-08-03 16:43:23 -07:00
Christian Goetze (CG) c5cca44bf5 Pulled build.sh change from viewer-release 2010-08-03 16:37:51 -07:00
Eli Linden e47bf5cd1c CT-575 WIP DE JA ES translation for set16 for Viewer 2.1.1 2010-08-03 14:59:14 -07:00
Eli Linden 4b2f46af40 CT-575 WIP DE JA ES translation for set16 for Viewer 2.1.1 2010-08-03 14:59:14 -07:00
Vadim Savchuk 4b00b98844 EXT-8534 FIXED Fixed the 'Wear' in My Outfits being disabled for outfits consisting of body parts only.
Changed the condition to enable the "Wear" button in My Outfits and the corresponding item in the outfit context menu.
They now get enabled for any outfit that isn't the base outfit and contains non-worn wearables.

By the way, did a minor cleanup: moved an LLAgentWearables.isCOFChangeInProgress() call to LLAppearanceMgr::getCanAddToCOF() to avoid code duplication.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/832/

--HG--
branch : product-engine
2010-08-03 23:28:51 +03:00
Richard Linden 2f10bcf5f5 fix for unit test asserts 2010-08-03 12:13:50 -07:00
Eli Linden ae4bc473e5 CT-575 FIX linguistic work from q/viewer-release lost in dessie/viewer-release. Re-comitting. 2010-08-03 11:17:35 -07:00
Vadim Savchuk 8544752ea3 Merge from default branch
--HG--
branch : product-engine
2010-08-03 17:03:22 +03:00
Vadim Savchuk e2135bd6dd Merge from default branch
--HG--
branch : product-engine
2010-08-03 16:28:58 +03:00
Tofu Linden c89ff6e80b merge from PE's viewer-trunk 2010-08-03 13:35:33 +01:00
Tofu Linden 332cf3d32a merge from viewer-release 2010-08-03 13:33:55 +01:00
Tofu Linden 4f2641aef0 merge from PE's viewer-release 2010-08-03 13:33:06 +01:00
Christian Goetze (CG) d10b9a7f37 Pulled from "dessie/viewer-release" 2010-08-02 22:05:56 -07:00
Richard Nelson 39965cf6e8 merge from dessie/viewer-release 2010-08-02 19:45:35 -07:00
Richard Nelson df5d5b8414 EXT-8545 FIX Button art and other images are positioned incorrectly when UI scale != 1.0 2010-08-02 18:54:31 -07:00