Commit Graph

11447 Commits (de65b93f082a680b86b6afed59f028d0bddb0eb6)

Author SHA1 Message Date
Monroe Linden de65b93f08 Fix for EXT-8230
LLPanelMediaSettingsPermissions::initValues() was referencing both XUI elements that don't exist and strings that don't appear in strings.xml.

Also fixed a number of elements in panel_media_settings_permissions.xml and floater_tools.xml that weren't graying out properly when non-editable items were selected, and some mixed up image attributes that made the media "gear" icon states look wrong.
2010-07-15 17:07:05 -07:00
Monroe Linden 551f74125b Changes to allow disabling an LLTextBox (or LLTextBox subclass) to gray out the text.
Due to some legacy issues, text boxes will not gray out on disable unless they have their text_readonly_color property in xui set to "LabelDisabledColor" (or some other color distinct from their text color).

Reviewed by Richard.
2010-07-15 16:32:50 -07:00
brad kittenbrink 39f241aad2 Fix for SNOW-742 compile & link errors under certain gcc versions due to violation of One Definition Rule.
reviewed by Moss.
2010-07-15 11:29:55 -07:00
Tofu Linden f65a95157a merge from PE's viewer-trunk (viewer-public) 2010-07-15 08:54:55 +01:00
Dessie Linden be299644e3 Merged from viewer-release 2010-07-14 06:39:14 -07:00
Tofu Linden 4339600d43 fix some wacky casting. 2010-07-14 10:16:18 +01:00
Tofu Linden 5c5057eb9a merge from PE's viewer-release 2010-07-14 10:08:54 +01:00
Matthew Breindel (Falcon) 37fc4e42dd Merge 2010-07-13 17:16:36 -07:00
Matthew Breindel (Falcon) a884f5c0c7 Added AgentPositionSnaps data to ViewerStats to measure frequency and scale of interpolation failures. 2010-07-13 17:16:05 -07:00
Xiaohong Bao 75c70884da trivial: convert to UNIX line endings. 2010-07-13 15:52:35 -06:00
Xiaohong Bao 961090b8fa Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-07-13 15:48:50 -06:00
Xiaohong Bao 83b693b134 EXT-7940: FIXED: Max # of non-impostor avatars is off by 2 2010-07-13 15:49:26 -06:00
Xiaohong Bao d9ff1c28a3 EXT-7500: FIXED: Texture Jamming problems with http texture off 2010-07-13 15:18:03 -06:00
Xiaohong Bao 0ba75fe2d6 EXT-7400: FIXED: 2.0.2 texture queue gets jammed;
EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than 1.23.5
2010-07-13 13:40:08 -06:00
Eli Linden fd11c24de0 ND-47671 WIP FR PT IT linguistic 2010-07-13 11:45:07 -07:00
Alexei Arabadji 84a6b19760 Automated merge with https://hg.productengine.com/secondlife/viewer-release/
--HG--
branch : product-engine
2010-07-13 19:43:04 +03:00
Alexei Arabadji c73dcb0a2d EXT-8341 FIXED Avoided assertion on receiving object auto return notification.
Details:
1 Provided passing necessary is_group parameter to LLPostponedNotification::add<LLPostponedServerObjectNotification> method call;
3 Corrected handling group name in LLPostponedNotification::onCachedNameReceived;
2 Added check on retrieved name from cache name and replacement with fallback value.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/743/

--HG--
branch : product-engine
2010-07-13 19:42:31 +03:00
Vadim Savchuk 83e4862f99 merge
--HG--
branch : product-engine
2010-07-13 18:55:35 +03:00
Vadim Savchuk ba1123e3e4 Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp

--HG--
branch : product-engine
2010-07-13 18:54:16 +03:00
Igor Borovkov 3ddd44e5e6 EXT-8329 FIXED added updating Plus button on COF changes
added updating Plus button (Wear Item button) on COF changes (only when Edit Outfit panel is trully visible)

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

--HG--
branch : product-engine
2010-07-13 18:47:04 +03:00
Igor Borovkov 4965f9f2d5 EXT-7668 FIXED prohibited deselecting a single selected item w/o using CTRL
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/746/

--HG--
branch : product-engine
2010-07-13 18:43:30 +03:00
Andrew Polunin 885442eb54 EXT-7639 FIXED (Make shop button open different URLs depending on what is selected in outfit editor)
- Fixed old market place URL to the new one in the settings.xml.
- Implemented the following feature: \"When Add More panel in focus selection inside it should supersede selection in accordions\". To achieve this:
-- LLPanelOutfitEdit::getCOFWearablesSelectionType() function was implemented.
-- LLPanelOutfitEdit::getAddMorePanelSelectionType() function was implemented.
-- LLPanelOutfitEdit::getWearableTypeByItemUUID(const LLUUID& item_uuid) function was implemented.
-- LLPanelOutfitEdit::onShopButtonClicked() was rewritten to use those functions.
- Fixed the problem with shop button and gender: now shop button for male leads to male links.

Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/725/

--HG--
branch : product-engine
2010-07-13 17:31:15 +03:00
Vadim Savchuk 3df8646fd9 merge
--HG--
branch : product-engine
2010-07-13 17:20:48 +03:00
Vadim Savchuk 2a1b8318bd Merge from default branch
--HG--
branch : product-engine
2010-07-13 17:20:00 +03:00
Igor Borovkov 3e9e2be584 merge
--HG--
branch : product-engine
2010-07-13 17:09:51 +03:00
Igor Borovkov 962bf7bc41 EXT-8328 FIXED passed missing parameter (callback) instead of a default one to the LLAppearanceMgr::addCOFItemLink(...)
appearance update callback wasn't passed down to LLAppearanceMgr::addCOFItemLink(...),
so wearables list was updated before receiving server response regarding creating of the COF item link

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

--HG--
branch : product-engine
2010-07-13 17:08:35 +03:00
Sergei Litovchuk b34bf6d871 EXT-8180 FIXED resetting wearable items list position to top on "Add More" panel opening.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/680/.

--HG--
branch : product-engine
2010-07-13 17:04:33 +03:00
Dessie Linden c3099df719 Merged from viewer-release 2010-07-13 05:27:27 -07:00
Andrew Dyukov fa3a77abdd EXT-8146 FIXED Removed plural from question about outfit removal
Corrected question string in xml.

Trivial fix- no review.

--HG--
branch : product-engine
2010-07-13 13:45:05 +03:00
Andrew Dyukov 1a960a3218 EXT-8320 EXT-8321 FIXED Added missing names for items text in camera floater xml.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/738/

--HG--
branch : product-engine
2010-07-13 13:13:23 +03:00
Tofu Linden c8602b2935 merge from PE's viewer-release 2010-07-13 09:22:06 +01:00
Aimee Linden ef685e5209 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-07-13 00:03:11 +01:00
Richard Nelson fce7f76cd7 merge 2010-07-12 15:05:14 -07:00
Richard Nelson 4797f54b0f EXT-8305 FIX [crashhunters] Crash in LLTabContainer::findChildView 2010-07-12 15:04:56 -07:00
Nyx (Neal Orman) 856e830831 Automated merge with ssh://hg.lindenlab.com/q/viewer-release/ 2010-07-12 16:42:56 -04:00
Monroe Linden 68982388d3 Fix for EXT-8314
Made LLPipeline::generateWaterReflection() not try to call LLVOAvatarSelf::updateAttachmentVisibility() if isAgentAvatarValid() returns false.

Reviewed by Nyx at http://codereview.lindenlab.com/2585007
2010-07-12 13:35:21 -07:00
Richard Nelson a2b9af626f fix for idiotic gcc 2010-07-12 13:30:05 -07:00
Nyx (Neal Orman) 83716055d9 Automated merge with ssh://hg.lindenlab.com/q/viewer-release/ 2010-07-12 16:22:59 -04:00
Nyx (Neal Orman) 2630252a9f EXT-8151 FIX multi-selection breakage
Original patch merged poorly with a coverity cleanup, resulting in us not
passing the callback on to the proper functions for clothing (we did for
bodyparts). Added the callback and wearing clothing works again!

Code reviewed by Monroe
2010-07-12 16:22:48 -04:00
Richard Nelson adf597e4c4 merge 2010-07-12 12:06:49 -07:00
Richard Nelson 367b689d57 fix for invisible selections in edit outfit panel 2010-07-12 12:06:15 -07:00
Monroe Linden b80ee71bed Fix for reopened EXT-8025
Fixed an issue in LLFlatListView where calling setCommitOnSelectionChange(true) wasn't always causing the commit signal to be sent when the selection changed.

Reviewed by Richard at http://codereview.lindenlab.com/2579010
2010-07-12 11:28:48 -07:00
Eli Linden a59f159281 ND-47672 WIP PT translation for set 14, new files 2010-07-12 11:51:03 -07:00
Eli Linden 8c8bbf376a ND-47672 WIP PT translation for set 14 2010-07-12 11:50:51 -07:00
Eli Linden 0fd4917b37 ND-47671 WIP IT translation for set 14, new files 2010-07-12 11:47:00 -07:00
Eli Linden 4924fbce00 ND-47671 WIP IT translation for set 14 2010-07-12 11:46:46 -07:00
Eli Linden 50cef9ac80 ND-47674 WIP ES and JA translation for set 14, new files 2010-07-12 11:44:32 -07:00
Eli Linden a938af8d5e ND-47674 WIP ES and JA translation for set 14 2010-07-12 11:44:18 -07:00
Eli Linden fa372a2963 ND-47673 WIP DE translation for set 14, new files 2010-07-12 11:40:13 -07:00
Eli Linden d2c344d775 ND-47673 DE translation for set 14 2010-07-12 11:39:56 -07:00