Commit Graph

9832 Commits (cc7bd911a0852c9ac01eafcd13b06b39dae7e7fe)

Author SHA1 Message Date
Dessie Linden cc7bd911a0 Merge 2010-05-26 12:42:38 -07:00
Dessie Linden 44c8565fe1 EXT-7017 FIXED Changed dialog phrasing to match recommendation 2010-05-26 12:41:55 -07:00
Eli Linden cb1c9f4c68 ND-46735 WIP FR JA linguistic 2010-05-26 12:41:28 -07:00
Richard Nelson 74279f551b merge 2010-05-26 10:11:14 -07:00
Richard Nelson a01de4d25f EXT-7058 FIX Viewer freezes if IM chat floater with teleport offer is resized a few times 2010-05-26 10:10:20 -07:00
Mike Antipov 14418c1970 Merge from default branch, resolving conflict in indra/newview/llinventorybridge.cpp
LLObjectBridge::openItem() was concurrency modified.
Applied behavior that was changed in c3220f7f7699 according to
	VWR-13743 FIXED Change Request: Change double click action for inventory wearables
	DEV-33391 FIXED Change Request: Change double click action for inventory wearables

--HG--
branch : product-engine
2010-05-26 10:24:05 +03:00
Richard Linden 6885a1a6ad merge 2010-05-25 16:51:24 -07:00
Richard Linden a2600644ab DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the viewer 2010-05-25 16:51:06 -07:00
Palmer c89af9db54 EXT-7487 - Bumping down class of 7000 series nvidia cards. 2010-05-25 16:18:36 -07:00
Callum Prentice d7911eda9c Merge 2010-05-25 16:07:15 -07:00
Callum Prentice 4bd0291dff Merge 2010-05-25 16:06:40 -07:00
Callum Prentice 879f0cd5fd Updated install.xml to point to a version of temporary version LLQtWebKit that skips past SSL/Cert errors so QuickBuy functions can be tested. (Windows only)
Also tweaked the QuickBuy Currency floater so scrollbars do not appear for current Web content
2010-05-25 16:06:01 -07:00
Loren Shih cef5b2c5a4 automated merge 2010-05-25 18:15:22 -04:00
Loren Shih 1cc24544d4 Fixed compile error in mistakenly-checked-in llvoavatarself.h 2010-05-25 18:13:46 -04:00
Eli Linden 208d935e8f Merge 2010-05-25 14:33:30 -07:00
Eli Linden 16d337307e EXT-7289 FIX en_xui_change 2010-05-25 14:32:09 -07:00
Loren Shih 1b56e79624 automated merge 2010-05-25 16:06:34 -04:00
Loren Shih 35fb83e1e3 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Removed llinfos that was causing excessive spam.
2010-05-25 16:05:17 -04:00
Loren Shih 00d534d7a7 EXT-7480 Add debuga bility to set texture discard levels
Added TextureDiscardLevel override for specifying texture discard levels.
Aesthetic change to add debug- flag to all avatar debug reporting metrics.
2010-05-25 14:56:45 -04:00
Eli Linden 8da5677f8a ND-46735 WIP IT JA linguistic 2010-05-25 11:17:21 -07:00
Richard Linden f6b4cd3b32 fix for llinitparam logic (using wrong scope for static method) 2010-05-25 10:23:21 -07:00
Richard Linden 1040c7039b merge 2010-05-25 10:15:09 -07:00
Paul Guslisty 85b62440ef FIXED EXT-7469 Enabled 'fit to parent' parameter for accordion
- Enabled 'fit to parent' parameter for accordion

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

--HG--
branch : product-engine
2010-05-25 18:36:03 +03:00
Mike Antipov a9398f240d EXT-6937 PARTIAL FIXED Enable a possibility to "mute everyone" in case group chat is already in "moderate_mode" state.
Partial fix (until restart moderator's viewer)
* store "moderate_mode" session state
* if session is already in requested state participants un/mute individually.

Known Issue:
"moderate_mode" session state is set to false on startup. Thus if moderator join voice chat with disabled voice it has incorrect state.
In this case when he sends "Mute everyone" request first time it has effect only to himself. Other unmuted participants are not muted.
Next "Mute everyone" request works properly: one request per participant is sent.

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

--HG--
branch : product-engine
2010-05-25 16:17:47 +03:00
Mike Antipov 574e6cb390 EXT-7471 PARTIAL FIXED Ensure bottom tray chatbar can always be resized by user.
Seems, there is a problem somewhere in rendering of LLLAyoutStack children. Last visible panel marked as user_resize=true can not be resized and has no resize cursor.
Because we have no time & resources to investigate this closely a workaround is implemented for bottom tray:
 * set user_resize for layout panel with Speak button which is always visible to user;
 * set user_resize=false to don't have Speak button panel resizable.

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

--HG--
branch : product-engine
2010-05-25 15:36:05 +03:00
Andrew Polunin ecd93410ff EXT-7142 FIXED Upload functionality duplicated in the Build menu and Select Linked Parts menu moved up
- LLPanelMainInventory::setUploadCostIfNeeded() - uncommented the line which enables retrieving of the upload cost price using LLGlobalEconomy class.
- Implemented LLUploadCostCalculator event handler in the llviewermenu.cpp (the fact that it should be implemented in this file was discussed with Mike Antipov).
- LLUploadCostCalculator::calculateCost() is implemented only for code readability: it's name is more descriptive than a code snippet placed directly in the constructor (LLPanelMainInventory::setUploadCostIfNeeded() works in similar way: it calculates cost_str only once).
- 'Select Linked Parts' menu was moved below 'Edit Linked Parts'.
- 'Upload' menu was added at the bottom, below 'Options' menu

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

--HG--
branch : product-engine
2010-05-25 15:31:07 +03:00
Tofu Linden a781dd767c VWR-13743 FIXED Change Request: Change double click action for inventory wearables
DEV-33391 FIXED Change Request: Change double click action for inventory wearables

Pulled this from the AvP backlog and implemented it, as it's a pain point from Ben's usability findings.  And people loooove this in 3rd party viewers.
(transplanted from cd0857d027305aec3dbdfe1940a04f7827e3a656)
2010-05-25 13:27:17 +01:00
Vadim Savchuk cb05897152 EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/

--HG--
branch : product-engine
2010-05-25 14:17:11 +03:00
Tofu Linden 2a99af8d94 Fix linux build from llinitparam problem... probably. 2010-05-25 06:26:10 +01:00
Richard Nelson a146a0f27b merge 2010-05-24 16:31:26 -07:00
Richard Nelson 7e487652e3 DEV-50271 WIP SLURL support for non-clickable names
fixed merging logic for blockvalues like rect, uiimage, etc
2010-05-24 16:30:55 -07:00
Nyx (Neal Orman) 7100d1ce00 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 17:19:06 -04:00
Nyx (Neal Orman) 40c672a61f AVP-92 FIX Avatar appears to be fat when opening the shape editor
Wearable editor previews were affecting the in-world avatar and not properly
resetting the changed parameters. Since the "body fat" slider is the last in
the default tab for the shape editor, this leaves your avatar fat.

Reconfigured the code to work through the wearables and most importantly
included a call to updateVisualParameters() at the end of the render function.

This appears to have fixed the issue - your avatar does not appear affected during
the avatar preview generation anymore.


Code reviewed by Seraph
2010-05-24 17:16:03 -04:00
Xiaohong Bao a98454059c Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 14:42:53 -06:00
Xiaohong Bao e2f6ec6294 EXT-7467: FIXED: [DUPLICATED XUI ID] panel_preferences_graphics1.xml has duplicated string id. 2010-05-24 14:41:24 -06:00
Loren Shih 5ab2127fe3 automated merge 2010-05-24 16:40:21 -04:00
Loren Shih 358d23a3a0 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Added more llinfos for tracking COF and InventoryModel changes.
2010-05-24 16:39:34 -04:00
Nyx (Neal Orman) 7be50ad3a5 AVP-60 EXT-7366 EXT-7209 WIP Camera views not correct when editing wearable
Added code to shift camera focus to appropriate section of the avatar when
wearable editor accordion tabs are expanded / collapsed.

Known issue: camera does not shift properly when first opening wearable editor.
Will implement a selectDefaultSubpart() function later.

Code reviewed by Prep
2010-05-24 16:16:28 -04:00
Richard Nelson 087ba60672 DEV-50271 WIP SLURL support for non-clickable names
fixed merging logic for blockvalues like rect, uiimage, etc
2010-05-24 12:25:21 -07:00
Nyx (Neal Orman) 0c55c8a0b8 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 15:06:40 -04:00
Nyx (Neal Orman) 53b6156379 AVP-91 FIX avatars rebaking on every login
Whitespace change as my last checkin was reviewed and tested to pass.
Avatar baked texture hashing now works across logins and uses the correct
texture indices.

Code reviewed by Vir
2010-05-24 15:06:24 -04:00
Eli Linden 5f24661778 Merge 2010-05-24 11:20:06 -07:00
Eli Linden f813793fac ND-46735 WIP IT JA linguistic 2010-05-24 11:19:34 -07:00
Nyx (Neal Orman) 536712a041 EXT-7436 FIX pt 2 - added extra check for wearable to prevent log spam
Reviewed by Seraph
2010-05-24 14:18:04 -04:00
Nyx (Neal Orman) 16134b2baa Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 13:49:04 -04:00
Nyx (Neal Orman) 8025997c89 AVP-91 WIP Fix baked texture hashing
First pass at fixing baked texture hashing - unified the hash code to one
function, made sure all messages pass correct texture indices.

Initial code review by Vir
2010-05-24 13:48:52 -04:00
Nyx (Neal Orman) a2c3df025c Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-24 13:12:39 -04:00
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
Loren Shih 583060bc63 automated merge 2010-05-24 12:55:22 -04:00
Loren Shih b92c1b6d74 EXT-7463 FIXED Create instrumentation for tracking COF actions on login
Added a bunch of llinfos to track various COF link item actions.
2010-05-24 12:52:50 -04:00