Commit Graph

11743 Commits (0a55a522a65d2e59b736c3c53feba0a0bbf865d0)

Author SHA1 Message Date
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
Xiaohong Bao 08b74c369f Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-03 18:27:58 -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
Christian Goetze (CG) c5cca44bf5 Pulled build.sh change from viewer-release 2010-08-03 16:37:51 -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
Christian Goetze (CG) b3b8ef25e1 Eliminate the bad merge at "2026f824953f" 2010-08-02 17:03:55 -07:00
Christian Goetze (CG) 6a1fefac22 Redo the same merge as in changeset "2026f824953f", but this time with feeeeling. 2010-08-02 16:59:20 -07:00
Christian Goetze (CG) 4f6e814eaa Fix the reversion imported from viewer-hotfix via: "hg pull -r 1c95812ba38b ../viewer-public" - reviewed by richard 2010-08-02 15:57:01 -07:00
Richard Nelson bd20eddd4e EXT-8540 - Implement mime type override for web_browser ctrl
reviewed by Monroe
2010-08-02 14:52:09 -07:00
Sergei Litovchuk dd6d7dde7e Fixed build (unit tests linking errors).
--HG--
branch : product-engine
2010-08-02 22:26:49 +03:00
Eli Linden a39b31abf8 CT-575 WIP FR PT linguistic 2010-08-02 10:52:35 -07:00
Sergei Litovchuk e5b33c31c3 EXT-7676 FIXED Restored fix (47df1b3fd94e) reverted in merge 5b5cc4a8642d with slight modifications.
- Replaced pointers passed to 'Add More' gear menu with LLHandle.
- Removed storing 'Add More' panel sort order from settings because the order is changed each time the panel opens.
- Replaced creating items comparator in LLPanelOutfitEdit::postBuild() with a static comparator in llwearableitemslist.cpp.

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

--HG--
branch : product-engine
2010-08-02 20:52:17 +03:00
Andrew Dyukov 713417aeeb EXT-5609 FIXED Avoided showing script floater undocked if it was created in mouselook mode.
Commiting on behalf of Alex Productengine.

- Added check if floater is constructed in mouselook mode and added forcing dock state when floater is shown after constructing in mouselook mode.

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

--HG--
branch : product-engine
2010-08-02 21:00:02 +03:00
Vadim Savchuk 367428e09e Manual merge from default branch. Resolved conflicts in indra/newview/llfloatercamera.cpp.
--HG--
branch : product-engine
2010-08-02 19:46:42 +03:00
Vadim Savchuk b12201bf01 EXT-6542 Localized the "none/none" in the About land floater.
This is an additional fix to the one made in rev. 6788ff579917.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/828/

--HG--
branch : product-engine
2010-08-02 19:04:32 +03:00
Vadim Savchuk 3b7da51117 Merge from default branch
--HG--
branch : product-engine
2010-08-02 18:59:35 +03:00
Kent Quirk f423a69864 Merge. 2010-07-30 22:43:15 -04:00
Richard Nelson 3c27e119b4 fixed windows build 2010-07-30 17:45:13 -07:00
Richard Nelson 8aac492b6a merge 2010-07-30 17:41:55 -07:00
Richard Nelson cba6943b27 optimizations in button rendering 2010-07-30 17:41:41 -07:00
Rick Pasetto 08f13801d2 Automated merge with ssh://richard@hg.lindenlab.com/dessie/viewer-public 2010-07-30 17:33:50 -07:00
Rick Pasetto 52a39060c7 fix for mac 2010-07-30 17:33:41 -07:00
Monroe Linden e56a0dfd28 Fix mac build. 2010-07-30 17:33:00 -07:00
Rick Pasetto c0819d7998 fix for mac build 2010-07-30 17:30:53 -07:00
Monroe Linden 6833a97c94 Fix for EXT-8533
When sending the MIME type probe, tell LLCurl to allow cookies in the response.  This works around an issue with some sites that will get into an infinite redirect loop when cookies are disabled.
2010-07-30 17:13:27 -07:00
Palmer d109457311 Upgraded NVIDIA 120 and 220 to class 1. They're performing too well. 2010-07-30 16:21:21 -07:00
Richard Nelson 8181739471 fixed windows build 2010-07-30 16:07:08 -07:00
Richard Nelson 170c7b56a8 merge 2010-07-30 15:17:50 -07:00
Richard Nelson d72a21aca1 further UI rendering performance improvements 2010-07-30 15:17:32 -07:00
Monroe Linden 84a9e0abd8 Fix for EXT-8339
Added a couple of new nav states to LLViewerMediaImpl: MEDIANAVSTATE_FIRST_LOCATION_CHANGED_SPURIOUS and MEDIANAVSTATE_COMPLETE_BEFORE_LOCATION_CHANGED_SPURIOUS.  These behave just like the corresponding states without the _SPURIOUS suffix, but will be used if the new navigate doesn't change the current URL of the impl.  This allows us to catch cases like the repro of this issue and discard the spurious navigate events.
2010-07-30 13:51:37 -07:00
Andrew Meadows 0847d29e0a fix for DEV-52379 (viewer is not successfully caching object goemetry)
There was a typo between the files saved and those loaded.
saved in sobjects_gridx_gridy.slc bload loaded from objects_gridx_gridy.slc
Q will review later ;-)
2010-07-30 13:32:07 -07:00
Kent Quirk afaa076b7d remove useless assert and its temp variable that broke the build. 2010-07-30 15:57:46 -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