Commit Graph

6946 Commits (5b139bdf6178696739da479106962a7d1a04fefd)

Author SHA1 Message Date
Erica 5b139bdf61 Fixed too-dark object chat color 2010-02-09 06:37:31 -08:00
Tofu Linden 5abb6dece7 HACK HACK HACK to unbreak linux build while I wait for access to the new llqtwebkit code.
only affects linux.  may harm webkit functionality temporarily.  to be backed-out.
2010-02-09 14:00:33 +00:00
Monroe Linden bf2273d0ad Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-08 18:17:15 -08:00
Eli Linden 41da63f5e6 Linguistic fix on behalf of Simone 2010-02-08 16:06:20 -08:00
Monroe Linden d321c6aa98 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-08 15:43:07 -08:00
Callum Prentice 7877bd3e8e Merge with tip 2010-02-08 15:41:25 -08:00
Callum Prentice a01a54bcbc New version of LLQTwebkit to fix cookie bug introduced by contractor :) 2010-02-08 15:40:25 -08:00
Monroe Linden 6cd1b17565 Rebuild of mac llqtwebkit library to pick up changeset 4a97db00bfb1 (fix for an accidentally deleted line that prevented cookie file from being read). 2010-02-08 15:33:32 -08:00
Eli Linden 552ad07f33 merge 2010-02-08 14:57:17 -08:00
Eli Linden b6229addf2 DEV-43688 Cycle3 Tim's resizing of DE GUI 2010-02-08 14:55:59 -08:00
Xiaohong Bao 12358bd95f Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-08 14:41:06 -08:00
Xiaohong Bao 68ea8e13ac partial fix for EXT-4352. fixed mutex deadlocks and turned on the multi-threaded texture fetching. 2010-02-08 14:40:06 -08:00
Eli Linden a50768669d DEV-43688 Cycle3 Tim's resizing of JA GUI 2010-02-08 14:00:39 -08:00
Eli Linden 4f25dba20d DEV-43688 fix bad xml 2010-02-08 13:45:58 -08:00
Eli Linden fc897b2ed7 DEV-43688 fix bad xml 2010-02-08 13:43:31 -08:00
Eli Linden 24821504ec Merge 2010-02-08 13:38:56 -08:00
Eli Linden b55dc023bf DEV-43688 Cycle3 Tim's resizing of FR GUI, and Noelle's translation of tab_title attributes 2010-02-08 13:36:40 -08:00
Loren Shih 399d70eede automated merge viewer2.0->viewer2.0 2010-02-08 14:58:53 -05:00
Loren Shih 7e19328785 EXT-4846 : [NUX] Inventory Side Panel - Can we suppress the "Landmarks" and "My FavoriteS" folder since they have their own Task Panel?
Adding simple infrastructure for supporting ability to hide folder types from inventory panels, but NOT exercising this code.  This will be deferred for 2.1.
Also did some very superficial header file cleanup for LLInventoryPanel.
2010-02-08 14:52:24 -05:00
Callum Prentice cebf73337f Refer to updated LLQtWebKit with fix for potential cookie crash problem. 2010-02-08 11:30:52 -08:00
Eli Linden 19f4240f97 Merge 2010-02-08 11:16:11 -08:00
Eli Linden d0095124d5 DEV-43688 Cycle3 manual fix for missing tab_title= translation, JA DE 2010-02-08 11:15:25 -08:00
Karl Stiefvater (qarl) de2fabcf3d EXT-4929 Crash in llimage.cpp
EXT-4713 Hook attachment from loco pocos pirate outfit causes viewer crash

removed broken assert (all cases are covered by asserts downstream.)
reviewed by James.
2010-02-08 13:13:16 -06:00
Tofu Linden 3ab0c3238b PE merge. 2010-02-08 18:14:57 +00:00
Denis Serdjuk 6b92b866e4 fixed Bug EXT-3777 inspector tool tips and UI tool tips do not have round corners
Tooltip handler has been added to inspector floater. Default background image  of tooltip panel has been changed for inspector.

--HG--
branch : product-engine
2010-02-08 20:01:52 +02:00
Rick Pasetto ac59a7c130 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-08 09:36:26 -08:00
Paul Guslisty b98351d195 merge
--HG--
branch : product-engine
2010-02-08 19:13:33 +02:00
James Cook 9d003c9e17 Merge 2010-02-08 09:12:24 -08:00
James Cook e0f6dc33ab Tweak avatar name icon padding 2010-02-08 09:11:27 -08:00
Paul Guslisty acc0a2962b EXT - 3232 Refactoring: deleted unnecessary image_left_padding, image_right_padding members from button.h and button.xml and their the only place usage in LLTabContainer::reshapeTuple . Now image overlay placement adjustible via: mLeftHPad, mRightHPad, mImageOverlayBottomPad, mImageOverlayTopPad, mImgOverlayLabelSpace
--HG--
branch : product-engine
2010-02-08 19:09:23 +02:00
Tofu Linden 0ff9f7f711 Try to fix coverity build; the media drag-and-drop code introduced an ole32 dep into llwindow. 2010-02-08 16:43:24 +00:00
Eugene Mutavchi d60d73a9e0 Fixed major bug EXT-5022 (streaming media first use dialog should be removed)
--HG--
branch : product-engine
2010-02-08 18:32:53 +02:00
Tofu Linden 62ce5d0ebd fix linux build error - need #include for real classdef. 2010-02-08 16:17:39 +00:00
Tofu Linden aa20ba337e merge. 2010-02-08 16:08:15 +00:00
Dmitry Zaporozhan d2d6af3dfa Fixed critical bug EXT-4970 - Inventory offers by scripted objects are discarded when offered objects got the same name.
Had to do minor refactoring of LLScripFloaterManager in order to fix this issue.

--HG--
branch : product-engine
2010-02-08 18:06:41 +02:00
Paul Guslisty 7199c9cc1b EXT-3232 Refactoring: Improved the way of horizontal alignment of button's image overlay. Now mLeftHPad/mRightHPad is used instead of mImageOverlayLeftPad and mImageOverlayRightPad. Also mImgOverlayLabelSpace/imgoverlay_label_space members was added to button.(h/xml) to define space between image overlay and button's label
--HG--
branch : product-engine
2010-02-08 18:05:48 +02:00
Andrew Dyukov a35d61a6ec Fixed critical bug EXT-4971 (Crash when attemping to change UI size)
- Adding default glyph for fallback fonts is now skipped in LLFontFreetype::resetBitmapCache().

--HG--
branch : product-engine
2010-02-08 18:01:45 +02:00
Tofu Linden a4c32f6322 PE merge. 2010-02-08 15:59:43 +00:00
Sergei Litovchuk ae2cbf2df8 Fix for critical task (EXT-4710) Update maturity icons for World Map.
- Updated maturity icons in map overlay.

--HG--
branch : product-engine
2010-02-08 17:45:52 +02:00
Brad Payne (Vir Linden) 5dda2516ad merge 2010-02-08 09:50:04 -05:00
Sergei Litovchuk 8903719a7b Fixed normal bug (EXT-3044) Non-latin chars became invisible in LM description after saving.
- Disabled non-ascii input in text editor.

--HG--
branch : product-engine
2010-02-08 16:40:24 +02:00
Sergei Litovchuk 61013d9d24 Fixed normal bug (EXT-4212) There's an ability to send non-latin group notices but they turn to '????...' in group profile page.
- Disabled non-ascii input in text editor.

--HG--
branch : product-engine
2010-02-08 16:40:06 +02:00
Ychebotarev ProductEngine 5082ccaf9a fix for major EXT-5067 Copy-paste is broken in nearby and IM logs
--HG--
branch : product-engine
2010-02-08 16:25:04 +02:00
Tofu Linden bb977a194f PE merge. 2010-02-08 13:59:20 +00:00
Sergei Litovchuk 9bf24a72cb Implemented critical task (EXT-4710) Update maturity icons for World Map.
--HG--
branch : product-engine
2010-02-08 15:53:56 +02:00
Paul Guslisty 93bd065356 Fixed normal bug EXT - 3835 ([BSI] tabs in instant message floater should never change sizes)
--HG--
branch : product-engine
2010-02-08 15:21:24 +02:00
Tofu Linden 8eba0c4029 Add some asserts to catch some null derefs that, at least, the render-pipeline code seems to be hitting. 2010-02-08 13:20:03 +00:00
Mike Antipov d82be9cfef Update for critical bug EXT-4838 ([NUX] Add empty Groups list condition text)
- changed text of the message to "Try searching for some groups to join."

--HG--
branch : product-engine
2010-02-08 15:09:50 +02:00
Sergei Litovchuk 4e28c10971 Fixed major bug (EXT-5017) Landmark Info panel opens immediately after
retrieving data about landmarking location.

--HG--
branch : product-engine
2010-02-08 14:11:24 +02:00
angela 7d21ca8b2e EXT-4821 [NUX] Home Panel should default to open on first-run 2010-02-08 16:03:06 +08:00