Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Andrew Dyukov 66ddb437f1 EXT-7087 FIXED Added flashing icons for im tabs and hooked them up in code
Added new attribute image_flash to button.xml which sets an image used for button icon when button is flashing.
Pointer to this image is stored in member mImageFlash from LLButton and is used in LLButton::draw(). There are two
ways an image can flash now - by making changes in color according to flash_color attribute or by changing icon from
current to the one specified in image_flash. Second way is used only if the name of flash icon is different from
"FlashIconAbsent" which is there by default. First way is used otherwise. Used new selfmade orange icons for
flashing tabs.

--HG--
branch : product-engine
2010-05-31 22:30:35 +03:00
Sergei Litovchuk b3c1e9cd75 EXT-7201 FIXED Removed extra gear menu button.
- Removed extra gear button bar from "Edit Outfit" panel.
- Added one more dummy icon to "Add Wearable" panel button bar to chose the right dummy depending on the "Add Wearable" panel visibility.

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

--HG--
branch : product-engine
2010-05-31 22:20:17 +03:00
Yuri Chebotarev 3517393b4c merge
--HG--
branch : product-engine
2010-05-31 19:03:23 +03:00
Yuri Chebotarev 95fad9ce86 EXT-7045 FIX update Generic_Group_Large.png
no review, binary fix

--HG--
branch : product-engine
2010-05-31 18:20:06 +03:00
Alexei Arabadji 325729b739 EXT-7485 ADDITIONAL FIX Fixed crash at viewer exit
used raw pointer instead of auto_ptr, since lifetime of mSaveMenu field controlled by parent gMenuHolder

--HG--
branch : product-engine
2010-05-31 17:46:50 +03:00
Vadim Savchuk 4b8c269d94 merge; fixed gcc build
--HG--
branch : product-engine
2010-05-31 16:57:39 +03:00
Vadim Savchuk 39eb49c5f4 Manual merge from default branch.
Semi-automatically resolved conflicts in:
* indra/newview/llappearancemgr.cpp
* indra/newview/llappviewer.cpp
* indra/newview/llcofwearables.cpp
* indra/newview/llinventoryfunctions.cpp
* indra/newview/llpaneloutfitedit.cpp
* indra/newview/skins/default/xui/en/strings.xml
* indra/newview/skins/default/xui/ja/strings.xml

--HG--
branch : product-engine
2010-05-31 16:18:22 +03:00
Paul Guslisty aac23d2d1e EXT-7472 ADDITIONAL FIX Added panel switching from Tree List View to Flat List View when (+) button clicked on unwearable items or by selecting 'Replace' menu item from body part context menu
--HG--
branch : product-engine
2010-05-31 16:16:45 +03:00
Alexei Arabadji bfced6d4c1 EXT-7485 FIXED Updated 'save as new' button on inventory outfit pane to fit spec.
* moved logic related to combo button from LLPanelOutfitEdit to LLSaveOutfitComboBtn class;
* used LLSaveOutfitComboBtn class in LLPanelOutfitsInventory;
reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/459/

--HG--
branch : product-engine
2010-05-31 15:55:08 +03:00
Igor Borovkov 9f91d43680 EXT-7208 FIXED repositioned tattoo pickers to match the updated spec
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/460

--HG--
branch : product-engine
2010-05-31 13:56:47 +03:00
Aimee Linden de52f3ae69 EXT-7556 FIXED Update Vivox SDK to 3.1.0001.8821 2010-05-29 23:17:28 +01:00
Richard Linden f3c9f631c2 merge 2010-05-29 13:32:03 -07:00
Richard Linden 2646eb8166 EXT-7557 - About Second Life > Credits does not open with scrollbar all the way at the top
also made floaters not update title label every time they are resized
2010-05-29 13:31:37 -07:00
Richard Linden 4f41b775b9 added ignore for avatar.log 2010-05-29 13:29:37 -07:00
Sergei Litovchuk 279f58051d FIXED Linux build.
Added forward specialization of LLStringUtil::format before use in LLStringUtil::formatDatetime.

--HG--
branch : product-engine
2010-05-29 19:36:55 +03:00
Tofu Linden 1ec70d45e4 minor typo fixes: texure->texture 2010-05-29 06:23:16 +01:00
Richard Linden efdfc298d4 Merge 2010-05-28 16:55:58 -07:00
Richard Linden 2703125698 Backed out changeset: 13b29333f1db 2010-05-28 16:55:12 -07:00
Xiaohong Bao 3df90898b1 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-28 17:09:48 -06:00
Xiaohong Bao c1170cfa48 A possible fix for EXT-7032: [crashhunters] crash in libcurl background thread on windows.
killed accessing the asset server for map textures after http returns 404.
2010-05-28 17:05:06 -06:00
Brad Payne (Vir Linden) 5a8063a0b8 texture logging - WIP 2010-05-28 17:58:29 -04:00
Andrew A. de Laix 648b553907 merge 2010-05-28 14:51:34 -07:00
Andrew A. de Laix 3a6d903ce0 mac llcommon dependent apps like mac-crash-logger get libexception_handler correctly packaged. 2010-05-28 14:51:12 -07:00
Aimee Linden 0e5347432c EXT-7498 WIP Hide share to web button until the code behind it is complete. 2010-05-28 22:42:19 +01:00
brad kittenbrink bca692a76d Use os x 10.4 deployment target for google_breakpad library package. 2010-05-28 14:29:58 -07:00
Lynx Linden d71ea5ffd9 Remove old minidump files on a clean exit, not on startup. 2010-05-28 22:14:06 +01:00
Sergei Litovchuk 40b476dbb2 EXT-7198, EXT-7491 FIXED Added mutli-selection support for outfit items and outfit tabs selection support.
- Added selecting multiple items from more than one accordion tab.
- Integrated context menus from Vadim's patch for EXT-6726 Appearance SP menus (WIP tier 2).
- Added selection to accordion control to use it instead of accordion tab focus in cases when focus is lost and outfit tab should stay selected.
- Changed "Wear" button behavior: "Wear" puts on currently selected outfit (as the tooltip reads "Wear selected outfit"). There is always an  outfit selected when the accordion is focused so for now there are no cases when only some items are selected. Separate items can be worn from context menu.
- Added moving accordion tab selection with right click. Fixed (EXT-7491) Right click on an accordion title should move selection to it.

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

--HG--
branch : product-engine
2010-05-29 00:06:34 +03:00
Loren Shih ea7047579d automated merge 2010-05-28 17:01:46 -04:00
Roxie Linden bb973c38e3 automated merge 2010-05-28 13:58:49 -07:00
Loren Shih 7efaa216a1 EXT-7504 WIP Force decloud after timeout using lower res textures
Code cleanup.
Some minor changes in logic for when low res texture is used.
Added more metrics to notifications and texture debug output.
2010-05-28 16:45:23 -04:00
Nyx (Neal Orman) 285c4c47f5 EXT-7505 FIX stuck in appearance edit mode if close appearance sidebar
Added a check for visibility changes that should prevent users from getting
"stuck" in appearance editing mode by closing the appearance editor
prematurely (clicking sidebar hide, etc).

Camera state should be restored when panel is restored.

reviewed by Seraph
2010-05-28 16:20:00 -04:00
Nat Goodspeed 2567519f9f Use OS X 10.5 build of breakpad library 2010-05-28 15:47:31 -04:00
Aimee Linden 66186ea81f Merged from ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-28 20:44:59 +01:00
Karl Stiefvater (qarl) 9a832999d9 fix unloaded no-particle avatar sphere to be fullbright, no black flicker. reviewed by Nyx. 2010-05-28 14:33:29 -05:00
Roxie Linden d427942d95 EXT-7466 - [BROKEN STRING] the word "administrator" is broken in strings.xml in 2 places
Simple fix
2010-05-28 12:26:29 -07:00
palange 5605ad1b9d Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-28 12:14:54 -07:00
Roxie Linden 1fe7b13d1f automated merge 2010-05-28 12:10:29 -07:00
Loren Shih a5c9e30fc8 automated merge 2010-05-28 15:01:45 -04:00
Loren Shih df853b1066 Fix for compile error in lltexlayer.cpp 2010-05-28 15:01:22 -04:00
Eli Linden 3f5abfb2bf ND-46735 WIP FR JA linguistic 2010-05-28 11:47:38 -07:00
Aimee Linden 12eb078c16 Merged from ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-28 19:33:50 +01:00
palange e167b8b171 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-28 11:32:12 -07:00
Loren Shih b7bfc3ae7a automated merge 2010-05-28 14:08:38 -04:00
Loren Shih 0b96ae29cf Fixed linux compile error due to missing forward declare in lltextureview.h. 2010-05-28 14:02:44 -04:00
Aimee Linden fd98253aec Fix borked merge, DOH! 2010-05-28 18:46:22 +01:00
Yuri Chebotarev 64ff80d542 merge
--HG--
branch : product-engine
2010-05-28 20:13:49 +03:00
Yuri Chebotarev 05626c3371 EXT-7013 FIX time formatting function didn't work for some parameters for Japanise (like weekdays).
reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/457/

--HG--
branch : product-engine
2010-05-28 20:13:18 +03:00
Paul Guslisty d42fd6cf7f EXT-7472 FIXED Open add to outfit panel by (+) button click on unwearable items and by selecting 'Replace' menu item click body part context menu
Main changes:
- Added callback for a '(+) button' to the LLCOFCallbacks and bind it with LLPanelOutfitEdit::onAddWearableClicked
- Created the callback(LLPanelOutfitEdit::onReplaceBodyPartMenuItemClicked) for 'Replace' menu item of context menu

Related changes:
- Changed LLFilteredWearableListManager so that it can use different functors (subclasses of LLInventoryCollectFunctor) as a criterion for LLInventoryItemsList filtering. Before it used only LLFindNonLinksByMask filter. Moved LLFindNonLinksByMask from to the llfilteredwearablelist.cpp to the llinventoryfunctions.h
- Created getter 'LLPanelDummyClothingListItem::getWearableType()' for LLPanelDummyClothingListItem
- Made 'add wearables panel' a member of LLPanelOutfitEdit so that not to use findChild each time panel is needed

Reviewed by Igor Borovkov at http://jira.secondlife.com/browse/EXT-7472

--HG--
branch : product-engine
2010-05-28 20:10:10 +03:00
palange 88d7073593 Automated merge with ssh://hg.lindenlab.com/palange/viewer-2-0 2010-05-28 09:35:46 -07:00
palange c901048d98 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-28 09:30:15 -07:00