Commit Graph

9773 Commits (4ef12d1ecfff418d90a90a39faada56d5effbb36)

Author SHA1 Message Date
Nyx (Neal Orman) 4ef12d1ecf EXT-7436 FIX every other login ruthing.
I think this is related - every time you wear one body part or a single piece
of clothing, it would remove all body parts, causing you to regenerate defaults
which makes you look like ruth. Simple error in logic, body parts should only
be replaced if they are being removed.

Code reviewed by Seraph
2010-05-24 13:12:28 -04:00
Aimee Linden bd53640901 EXT-7460 FIXED (VWR-19451) Viewer crashes when opening notifications console.
EXT-6783 replaced the "History" notifications channel with "Persistent" but llfloaternotificationsconsole.cpp still refers to "History".
2010-05-24 11:19:31 +01:00
Tofu Linden 5e5a895b76 merge from PE's viewer-trunk 2010-05-24 08:05:30 +01:00
Tofu Linden 08480629e9 merge backout 2010-05-24 07:49:36 +01:00
Tofu Linden 87d0c6d583 Backed out changeset 57e00f7d4d4f
(was: EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.)

This was causing osx/linux build failure.
2010-05-24 07:49:26 +01:00
Xiaohong Bao 28d4fe68f8 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-21 18:12:38 -06:00
Xiaohong Bao 81e6f6131b EXT-7394: FIXED: Trees have more polys at low detail than at high detail. 2010-05-21 18:04:32 -06:00
Monroe Linden 79f697ad51 Fix for EXT-5667 (support window.open() in shared media so google docs will work).
Moved the processing of clicks on _external and _blank targeted links from LLMediaCtrl to LLViewerMediaImpl.

Removed LLMediaCtrl::setOpenInExternalBrowser() since that functionality is available through the use of the _external target attribute in web content.

Removed LLMediaCtrl:: setOpenInInternalBrowser() since it was unimplemented and not used.

Made the webkit media plugin set llqtwebkit's window open behavior to WOB_SIMULATE_BLANK_HREF_CLICK.  This is #ifdefed out on Linux until we get a new Linux build of llqtwebkit.
2010-05-21 15:36:12 -07:00
Callum Prentice 9add3aa8cb Fixed Windows line endings that crept in 2010-05-21 15:27:27 -07:00
Callum Prentice ba9c64d2bb Merge 2010-05-21 15:23:36 -07:00
Callum Prentice d84990307b VI-65 - Addition of Quick/Eazy Buy Web based floater.
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency'
Reviewed by Sam/Richard
2010-05-21 15:22:32 -07:00
Tofu Linden df9e11b232 merge. 2010-05-21 22:43:09 +01:00
Nyx (Neal Orman) cde6608d0e Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-21 17:03:02 -04:00
Nyx (Neal Orman) f91481c82f EXT-7209 EXT-7366 FIX avatar needs to enter "appearance editing" mode
Avatar now enters "appearance editing" mode when opening the outfit or
wearable editors in the sidepanel. Changed code to ensure we don't
accidentally switch out of it and back in when switching from one to the other.

Note that this cuts out LLFLoaterCustomize from being built and shown to the user
from any UI. The code for this (and related classes) will be removed once we have
pulled any code out of it that we still need. The current outfit and wearable
editors should be working sufficiently for most purposes. Bugs should be reported
to Nyx Linden or the avatar team.

Code reviewed by Vir
2010-05-21 17:02:53 -04:00
Paul Guslisty 04d938230b EXT-6817 FIXED Increased floater width
- Increased floater width

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/435/

--HG--
branch : product-engine
2010-05-21 19:37:27 +03:00
Paul Guslisty 9f240d04d2 EXT-7284 FIXED Made more space between controls to avoid overlapping
- Moved to the right color_swatch
- made more vertical and horizontal space for \"Opacity\" and \"UI Size\"

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

--HG--
branch : product-engine
2010-05-21 19:17:22 +03:00
Paul Guslisty 32ce71dd6e EXT-6658 FIXED Fixed text overflow and truncation
- Made more vertical space between radio group and status text to avoid overlapping
- Moved by 5 pixels to the left \"checkbox fullbright\" checkbox to avoid trancation
- Replaced checkbox's label with TextBox to have ability to apply word_wrap for truncated label

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/430/

--HG--
branch : product-engine
2010-05-21 19:16:51 +03:00
Paul Guslisty 68db6412c7 EXT-6555 FIXED Made 'Add to outfits' and 'Edit outfit' panels visually connected to the buttons bar below
- Made 'Add to outfits' and 'Edit outfit' panels visually connected to the buttons bar below

Reviewed by Mike Antipov and Neal Orman at https://codereview.productengine.com/secondlife/r/416/

--HG--
branch : product-engine
2010-05-21 19:16:15 +03:00
Xiaohong Bao 517e8914f8 More for EXT-7309: Investigate turning RenderAvatarMaxVisible down to 1 or 2 on low end hardware.
set RenderAvatarMaxVisible to be 3 by default for low-end settings.
2010-05-21 10:15:56 -06:00
Sergei Litovchuk 336934c490 Fixed potential crash in LLInventoryItemsList - unsubscribed from callback in destructor.
Reviewed by Mike Antipov.

--HG--
branch : product-engine
2010-05-21 17:28:29 +03:00
Tofu Linden 0e545644e1 Updated Linux build of llqtwebkit, adding some support we'll need to fix EXT-5667 (support window.open() in shared media so google docs will work). 2010-05-21 13:06:53 +01:00
Vadim Savchuk bcdb1536c1 Merge from default branch
--HG--
branch : product-engine
2010-05-21 15:00:07 +03:00
Igor Borovkov 6dc2f859fe EXT-7406 FIXED filtering out items of a link type (panel outfit edit, wearable bottom list)
Reviewed by Mike Antipov, Vadim Savchuk and Neal Orman

--HG--
branch : product-engine
2010-05-21 14:17:12 +03:00
Igor Borovkov 1d4b26832c EXT-7331 FIXED added updating the title (panel outfit edit) on replacing/wearing outfit externally (my inventory)
Reviewed by Neal Orman and Mike Antipov

--HG--
branch : product-engine
2010-05-21 13:44:42 +03:00
Mike Antipov da35ebe312 Merge
--HG--
branch : product-engine
2010-05-21 13:27:09 +03:00
Mike Antipov 7439332656 EXT-6710 FIXED Implemented functionality to give multiselected inventory items to several selected avatars in avatar picker:
1. Select items to share
2. Click Share; Resident chooser opens
3. Select residents to share with, click SELECT
4. Selected items are transferred to selected users
5. Pop-up toast confirms transfer

Some implementation notes:
 * Avatar Picker is not closed when give inventory requests are sent (to be enable change selection and offer other items to other avatars)
 * Select button is enableв if all selected items can be offered.
 * Disabling of the "Share" menu item in the Inventory context menu is syncronized with check (before sending offer) whether item can be offered at all

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/

--HG--
branch : product-engine
2010-05-21 13:16:41 +03:00
Mike Antipov 5c370550bf EXT-6710 WIP Prepare to implementation - "Give inventory" related functionality was moved from the LLToolDragAndDrop to a separate class - LLGiveInventory.
To allow give several inventory items to several selected residents I need some functionality encapsulated in LLToolDragAndDrop class out of it.
No functionality should be changed.

LLToolDragAndDrop was updated to use new LLGiveInventory'methods instead of removed ones.

There were moved methods related to:
 - give inventory item
 - give inventory category
 - log into chat
Such functionality was moved:
 - is give acceptable
 - do inventory give operation
 - send give inventory request to server
 - process give inventory for protected items

QA Notes: Functionality related to give inventory via drag and drop should be re-tested closely.

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/

--HG--
branch : product-engine
2010-05-21 13:16:29 +03:00
Tofu Linden 9eaf8eaf72 merge from PE's viewer-trunk 2010-05-21 10:31:53 +01:00
Eli Linden 563c80d281 EXT-7288 WIP IT remove some overrides 2010-05-20 17:02:39 -07:00
Eli Linden 05a6ef7659 EXT-7287 FIX IT remove override 2010-05-20 16:42:34 -07:00
Xiaohong Bao 1162345378 More for EXT-7309: Investigate turning RenderAvatarMaxVisible down to 1 or 2 on low end hardware.
adjust the arrangements of the panel "preferences -> graphics -> Advanced".
2010-05-20 17:31:27 -06:00
Xiaohong Bao b8fa70502c Merge 2010-05-20 14:38:37 -06:00
Xiaohong Bao 46309f558e EXT-7309: PARTIAL FIXED: Investigate turning RenderAvatarMaxVisible down to 1 or 2 on low end hardware.
added a slider in "preferences -> graphics -> Advanced" to change RenderAvatarMaxVisible value.
2010-05-20 14:33:11 -06:00
Xiaohong Bao f9dd340de5 Merge 2010-05-20 14:21:09 -06:00
Roxie Linden 5e353cbf86 automated merge 2010-05-20 11:48:47 -07:00
Andrew Polunin 53505bd225 EXT-7223 FIXED (Add \"Shop\" Button in bottom of Inventory panel)
- Added 'MarketplaceURL' setting in settings.xml to represent URL which points to the Marketplace.
- Added member mShopBtn in the class LLSidepanelInventory.
- Added handler LLSidepanelInventory::onShopButtonClicked() which handles a click on the 'Shop' button
- Added corresponding widget in the sidepanel_inventory.xml

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/408/

--HG--
branch : product-engine
2010-05-20 21:16:16 +03:00
Sergei Litovchuk ae6c2de1e3 EXT-5666 FIXED Changed clicked attachment color.
--HG--
branch : product-engine
2010-05-20 18:57:29 +03:00
Mike Antipov c3a352b219 EXT-7371 FIXED Improved new state handling in p2p Voice channel to process session leave event correctly.
Reason:
* when user leave a p2p voice session himself the session's voice channel is marked as "ignore next leave session event"
* but when he re-starts the voice session the channel stays in "ignore next leave session event" state.
So, when an other p2p participant ends call this voice channel is not deactivated because of this flag.

Fix: reset "ignore next leave session event" flag to FALSE when viewer is joining p2p voice session.

Reviewed by Aimee Walton at https://codereview.productengine.com/secondlife/r/418/

--HG--
branch : product-engine
2010-05-20 17:33:26 +03:00
Yuri Chebotarev f64049c5d8 merge
--HG--
branch : product-engine
2010-05-20 16:59:36 +03:00
Yuri Chebotarev 55e26cf056 ext-7403 fix - reset all data before setting new group id
reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/419/

--HG--
branch : product-engine
2010-05-20 16:58:20 +03:00
Yuri Chebotarev 265f77747f EXT-6598 FIX Handle tooltip message for separator
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/417/

--HG--
branch : product-engine
2010-05-20 16:55:06 +03:00
Mike Antipov c75225bcb9 EXT-7104 WIP Enable Build button and set necessary callbacks.
Because it is not enough to call showInstance for Build Floater it was implemented in a such way:
* set save_visibility==true in floater tools to update button toggle state properly and subscribe Build button to listen visibility changes
* added callback to observe parcel changing to set build button enabled/disabled.

KNOWN ISSUE:
if build permissions are changed button will not change state until restart/teleport

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

--HG--
branch : product-engine
2010-05-20 16:51:35 +03:00
Alexei Arabadji 5ba494c4fa EXT-7363 FIXED Provided passing owner ID through chat object since it is necessary to correctly build objectim SLURL when chat history reloads content.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/420/

--HG--
branch : product-engine
2010-05-20 16:47:33 +03:00
Alexei Arabadji 6175738394 EXT-7391 FIXED Removed redundant responder functor setting that cause assertion.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/409/

--HG--
branch : product-engine
2010-05-20 16:41:34 +03:00
Tofu Linden be20b12c5c kill dos line-ending. 2010-05-20 12:52:55 +01:00
Andrew Dyukov 44c919dc38 EXT-7405 FIXED Changed "left" to "right" in text of tooltip.
Trivial fix, so not reviewed.

--HG--
branch : product-engine
2010-05-20 14:45:50 +03:00
Andrew Dyukov 49a79a3f68 EXT-7200 FIXED Integrated art missing from appearance.
Most changes are in xml, but changing of view buttons overlay icons in lists from add wearables is implemented in code. Dragbar icon was only added as file, it will be integrated in EXT-7255 (There is no dragbar between 'Edit Outfit' and 'Add to Outfit:' panels).

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

--HG--
branch : product-engine
2010-05-20 14:31:31 +03:00
Vadim Savchuk fe64168217 Manual merge from default branch.
Auto-resolved conflicts in:
- indra/newview/llpaneleditwearable.cpp
- indra/newview/llviewermenu.cpp
- indra/newview/llviewerwindow.cpp
- indra/newview/skins/default/xui/en/notifications.xml

--HG--
branch : product-engine
2010-05-20 14:05:32 +03:00
Tofu Linden ae0dbecb1c merge from PE's viewer-trunk 2010-05-20 11:44:49 +01:00
Tofu Linden 13d2501c84 SNOW-207/DEV-42245 : FIXED : Texture loading on sculpty plants is failing making content appear to be of poor quality.
Patch by Thickbrick, reviewed by me.
2010-05-20 11:38:57 +01:00