Commit Graph

9997 Commits (9354571174af49849b56b5cc2a81c8d65f59cdfe)

Author SHA1 Message Date
Tofu Linden 9354571174 merge. 2010-06-02 07:52:41 +01:00
Richard Linden 813d4cc8a3 added newline at end 2010-06-01 18:51:26 -07:00
Richard Linden bf8e93c6dc merge 2010-06-01 18:34:35 -07:00
Richard Linden 8beb651d76 EXT-7591 FIX Typing the first characters of a selection in a dropdown will ignore the first letter
clear the searchstring on list focus lost, not setFocus, so that the act of popping open the list when you type the first letter doesn't clear the first letter from the search string
2010-06-01 18:33:41 -07:00
Richard Linden 71fe767d9a EXT-7590 FIX Modal alerts obscure any modal alerts that they spawn
the toast logic to set visibility on dialogs in reverse order was bringing older modal dialogs to the front
2010-06-01 18:28:46 -07:00
Palmer b6250ac93a Merge for EXT-7588 (jira wasn't listed in qarl's commit), for making unloaded avatar sphere fullbright/no flicker 2010-06-01 15:47:16 -07:00
Palmer 8cca0d209f mo' mergin' mo' problems 2010-06-01 14:33:19 -07:00
Palmer d6d656963f EXT-7309 - FIX: for this feature. Was not turning on, on low. Reviewed by Bao 2010-06-01 14:32:49 -07:00
Tofu Linden 605a4a459e merge 2010-06-01 22:30:47 +01:00
Tofu Linden 08ee190ec8 EXT-7499 WIP Prevent other avatars from remaining with a ruth shape
to be reviewed by nyx.
2010-06-01 22:30:14 +01:00
Richard Linden 76afe7c0f5 merge 2010-06-01 13:54:00 -07:00
Loren Shih 7ea46b968c EXT-7504 WIP Force decloud after timeout using lower res textures
Changed timeout behavior to be recurring, so that low res textures are uploaded every X seconds as needed.
2010-06-01 16:06:42 -04:00
Richard Linden a817981f34 merge 2010-06-01 12:41:37 -07:00
Mike Antipov 4cc5c7d2a4 EXT-7379 FIXED Add save_visibility=true to search floater to enable interaction with Search button
Also added reset of floaters visibility on exit to emulate save_visibility=false

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

--HG--
branch : product-engine
2010-06-01 12:17:25 +03:00
Alexei Arabadji 4a4cdd3775 EXT-7268 FIXED Disabled local chat edit field for offline mode.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/454

--HG--
branch : product-engine
2010-06-01 09:50:56 +03:00
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
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
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
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
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
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
Aimee Linden de52f3ae69 EXT-7556 FIXED Update Vivox SDK to 3.1.0001.8821 2010-05-29 23:17:28 +01: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
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
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
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
Yuri Chebotarev 64ff80d542 merge
--HG--
branch : product-engine
2010-05-28 20:13:49 +03:00