Commit Graph

11729 Commits (2f10bcf5f57e2cc3f470492fef5f4ea939c458b8)

Author SHA1 Message Date
Richard Linden 2f10bcf5f5 fix for unit test asserts 2010-08-03 12:13:50 -07: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
Richard Nelson 147bc94274 changed to use childSetAction without void* argument 2010-07-30 09:57:52 -07:00
Richard Nelson 989552161d added LLPanel::childSetAction() that does not take a void* argument
implemented childGetVisibleTab/PanelWithHelp using breadth-first-search iterator
moved tentative state from llview to lluictrl
changes llcallbackmap to use boost::function
2010-07-30 09:56:49 -07:00
Richard Nelson fdb5223031 removed void* from ui callbacks and deprecated LLPanel::child*() methods 2010-07-30 09:46:28 -07:00
Richard Nelson ef00f0719d converted static callbacks to member functions and deprecated LLPanel::child*() methods 2010-07-30 09:42:10 -07:00
Richard Nelson 00711916fd converted static callbacks to member functions and deprecated LLPanel::child*() methods 2010-07-30 09:40:41 -07:00
Richard Nelson 5818cab81e converted static callbacks to member functions 2010-07-30 09:36:02 -07:00
Kent Quirk 8d707f0ed2 Merge 2010-07-30 10:15:48 -04:00
Kent Quirk 19c0d6d4ea Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1 2010-07-30 10:11:55 -04:00
Mike Antipov 84c848504c EXT-7796 ADDITIOANL FIXED Reopen reason - Camera Floater did not take into account edit appearance mode while it is being built.
FIX:
Store the "edit appearance" mode as internal floater's flag and apply it while building to ensure that its controls have right "enable" state.
Also added forcing of Pan Camera mode if floater is opened first time in Edit appearance mode.

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

--HG--
branch : product-engine
2010-07-30 16:16:55 +03:00
Mike Antipov 1302ad710e EXT-8161 FIXED Moved Invite button 5 px to the right to prevent cropping its border (when selected) by parent.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/827/

--HG--
branch : product-engine
2010-07-30 16:11:03 +03:00
Mike Antipov e263923d79 Merge from default branch
--HG--
branch : product-engine
2010-07-30 13:33:19 +03:00
Tofu Linden 5e32fb5d28 remove a nonsense assert that gcc was choking on. 2010-07-30 11:19:28 +01:00
Mike Antipov 122209c4a6 Merge from default branch
--HG--
branch : product-engine
2010-07-30 13:08:08 +03:00
Tofu Linden 96099cff38 merge from viewer-release 2010-07-30 10:09:05 +01:00