Commit Graph

11983 Commits (ec2eae01fa5f9f47492035537f9ddbee86471a84)

Author SHA1 Message Date
Xiaohong Bao fd3891ead5 EXT-8447: FIXED: crash at LLTextureCache::writeEntryToHeaderImmediately(int,LLTextureCache::Entry &,bool) [secondlife-bin lltexturecache.cpp] 2010-08-06 09:29:33 -06:00
Xiaohong Bao 4682264ead EXT-8447: FIXED: crash at LLTextureCache::writeEntryToHeaderImmediately(int,LLTextureCache::Entry &,bool) [secondlife-bin lltexturecache.cpp] 2010-08-06 09:29:33 -06:00
Tofu Linden 52138b24c5 merge from viewer-release 2010-08-06 15:13:10 +01:00
Tofu Linden 0a3493db08 EXT-8579 FIXED Develop.Avatar.Animation Info should not show asset IDs
Made it so that you only see real UUIDs if the viewer thinks you are in real godmode.
2010-08-06 14:28:26 +01:00
Vadim Savchuk 4f91a84c40 Merge from default branch
--HG--
branch : product-engine
2010-08-06 16:05:19 +03:00
Tofu Linden cb1744dae6 merge from viewer-release 2010-08-06 12:33:08 +01:00
Tofu Linden 6d1b892516 merge from PE's viewer-release 2010-08-06 12:28:51 +01:00
Eli Linden bcb7401645 CT-575 WIP IT translation for set16 for Viewer 2.1.1 2010-08-05 11:04:56 -07:00
Tofu Linden 8780c59894 merge 2010-08-05 16:28:11 +01:00
Tofu Linden e4ec91fecd merge 2010-08-05 16:27:15 +01:00
Tofu Linden 838dbb9b0f EXT-8304 FIXED [crashhunters] crash in LLKeyframeMotion::deserialize
Speculative bunch of robustification.
Reviewed by Soft.
2010-08-05 16:26:39 +01:00
Xiaohong Bao 0e673902f4 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-05 08:55:31 -06:00
Vadim Savchuk b103141506 EXT-8309 FIXED Incorrect French date format in place profile and status bar.
Changes:
- Added support for formatting day of the month without leading zero ("sday").
- Changed date format in place profile (landmark info) and in the top status bar
  according to bug reporter's request.

Technical details:
Actually implementation of strftime() in Linux and Windows supports stripping the
leading zero (with "%-d" and "%#d" respectively).
But that's not supported in MacOSX, so I had to reimplement it.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/842/
2010-08-05 15:57:19 +03:00
Eli Linden 35f279a907 CT-575 WIP IT translation for set16 for Viewer 2.1.1 2010-08-05 11:04:56 -07:00
Vadim Savchuk 46334b6310 EXT-8309 FIXED Incorrect French date format in place profile and status bar.
Changes:
- Added support for formatting day of the month without leading zero ("sday").
- Changed date format in place profile (landmark info) and in the top status bar
  according to bug reporter's request.

Technical details:
Actually implementation of strftime() in Linux and Windows supports stripping the
leading zero (with "%-d" and "%#d" respectively).
But that's not supported in MacOSX, so I had to reimplement it.

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

--HG--
branch : product-engine
2010-08-05 15:57:19 +03:00
Andrew Dyukov 4701fc0a18 EXT-8553 FIXED Substituted "Object Profile" menu item label by "Item Profile" in My Outfits.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/836/

--HG--
branch : product-engine
2010-08-05 15:49:06 +03:00
Tofu Linden 07f668fe2b fix a merge conflict I forgot to commit earlier. 2010-08-05 13:31:19 +01:00
Vadim Savchuk 2435126081 Merge from default branch
--HG--
branch : product-engine
2010-08-05 15:11:27 +03:00
Tofu Linden b68f753a75 (hairy) merge from viewer-release 2010-08-05 12:42:12 +01:00
Tofu Linden eef6ababcd merge from PE's viewer-release 2010-08-05 12:39:08 +01:00
Xiaohong Bao cd628d8ea8 merge the fix of SNOW-793: memory leak in LLImageFormatted::appendData 2010-08-04 16:58:21 -06:00
Eli Linden 057568bddc CT-575 WIP FR translation for set16 for Viewer 2.1.1 2010-08-04 15:35:13 -07:00
Brad Payne (Vir Linden) 2a8e330605 merge 2010-08-04 17:22:50 -04:00
Brad Payne (Vir Linden) e6d5cc3bd1 EXT-8283 FIX, EXT-8360 FIX - original fixes got broken, presumably during some merge 2010-08-04 17:21:33 -04:00
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