Commit Graph

10579 Commits (6bbbd6582fdf5bb24cf69f2106662032b2f77b8a)

Author SHA1 Message Date
Loren Shih 6bbbd6582f EXT-7888 FIXED Opening a gesture from an in-world object shows gesture floater with blank information
EXT-7909 FIXED Cleanup llpreviewgesture #include files

Fixed an issue that was causing gesture asset loading to fail.
Also did header file cleanup.
2010-06-17 11:10:28 -04:00
Loren Shih 08515a8eb3 EXT-7890 FIXED "Open" on folder of in-world contents does nothing
Removed "open" menu option, to be consistent with right-click options on inventory folders elsewhere.
2010-06-16 17:49:04 -04:00
Loren Shih 67185e19b4 EXT-5342 FIXED Open in Inventory contents does nothing for certain item types
"Open" is added conditionally based on item type.
2010-06-16 16:40:48 -04:00
Loren Shih 5635f10c41 automated merge 2010-06-16 14:29:10 -04:00
Loren Shih 823ae2ea98 EXT-7735 FIXED When receiving a folder, "Show" (or hotlink) doesn't do anything
Fixed highlight and open item code to work for both categories and items (was previously only working for items).
2010-06-16 13:35:57 -04:00
gabriel lee abb0ccb762 ext-7834 fixed corruption of menu item vector
reviewed by richard
2010-06-16 18:04:37 +01:00
gabriel lee 42a4ab9ae1 EXT-7834 fixed corruption of menu item vectors
reviewed by Richard
2010-06-16 18:03:03 +01:00
Richard Nelson 206ce0bb2c fix for broken rear view camera 2010-06-16 09:50:09 -07:00
Tofu Linden 9ee5a62332 merge from PE's viewer-release 2010-06-16 11:02:45 +01:00
Paul Guslisty 46ebc6d373 EXT-7576 FIXED 'Add to Outfit:' panel should shrink the top 'Edit Outfit' list to 1/3 the vertical height
- Increased height of 'Add to Outfit' panel and set animate for layout stack. Animate attrubute was set to true to force proper calculation of layout panels size when one of the layout panels can dynamically change its visibility

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

--HG--
branch : product-engine
2010-06-16 11:21:20 +03:00
Paul Guslisty 5de0b6ac29 EXT-7667 FIXED There is much unnecessary empty space from the right side in the Group profile information
- Increased width of layout panel and its accordion

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

--HG--
branch : product-engine
2010-06-16 11:18:38 +03:00
Alexei Arabadji 8e9d7d3d00 Automated merge with https://hg.productengine.com/secondlife/viewer-release/
--HG--
branch : product-engine
2010-06-16 11:11:07 +03:00
Alexei Arabadji f74fe0c212 EXT-7763 FIXED Made text editor of script error window as read only.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/594/

--HG--
branch : product-engine
2010-06-16 11:03:28 +03:00
Yuri Chebotarev 0a6a0c3515 merge
--HG--
branch : product-engine
2010-06-16 10:11:46 +03:00
Yuri Chebotarev a66ec792c9 EXT-7790 FIX Reset inventory filter when showing original item in inventory
reviwed by Loren Shih at https://codereview.productengine.com/secondlife/r/575/

--HG--
branch : product-engine
2010-06-16 10:10:59 +03:00
Richard Linden 594d2618aa fixed crash in accordionctrl 2010-06-15 16:29:29 -07:00
Richard Linden f56bc6c04a merge 2010-06-15 15:38:45 -07:00
Richard Linden 4fb3198642 EXT-7090 WIP STRG(CTRL)+SHIFT+S in Mouselook doesnt make a snapshot
made world view extend to where menu bar would normally be when in mouselook
2010-06-15 15:25:55 -07:00
Loren Shih 4ae0a0703b EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a couple more llinfos spam to not show up in release mode.
2010-06-15 17:58:08 -04:00
Richard Linden 251a695c78 EXT-7870 - Turn down footstep volume 2010-06-15 14:54:58 -07:00
Loren Shih d801628cb4 automated merge 2010-06-15 17:12:42 -04:00
Loren Shih d2d95e9645 automated merge 2010-06-15 17:12:22 -04:00
Monroe Linden 79c4c1241b Enable the call to LLQtWebKit::setWindowOpenBehavior() on Linux, since the llqtwebkit build has been updated. 2010-06-15 14:11:26 -07:00
Loren Shih 0be5ce0a59 EXT-7468 FIXED Remove all 2.1 COF debugging code
#ifdef'd a bunch of llinfos spam to not show up in release mode.  Removed some other legacy comments.
2010-06-15 17:11:01 -04:00
Loren Shih 8294f69ea3 EXT-7651 FIXED Take out hack in isLocalTextureDataFinal for TextureDiscardLevels
Removed hack (this was just used for debugging avatar rez times).
2010-06-15 17:09:43 -04:00
Brad Payne (Vir Linden) 050199e031 merge 2010-06-15 16:57:25 -04:00
Brad Payne (Vir Linden) 3ce5e0e99d EXT-6953 FIX - enable new walk/run by default 2010-06-15 16:56:51 -04:00
Richard Linden 2b7188d614 merge 2010-06-15 13:54:06 -07:00
Richard Linden 8b95793c35 EXT-6953 WIP fixed walk cycle foot slip feedback to not speed up animation so much
also, made camera default target and offset live-settable for debugging

reviewed by vir
2010-06-15 13:53:40 -07:00
Loren Shih f12aa928c5 EXT-7758 FIXED Take out "Change FolderType" for viewer2.1.
Change folder type is now keyed off of SUPPORT_ENSEMBLES versus being available in non-release viewers.
2010-06-15 15:56:54 -04:00
Loren Shih 40133be7be EXT-7829 FIXED Corrupted graphics in inventory side panel (gray box)
Took out ensemble folder icon use, replaced with default icons.
2010-06-15 15:56:46 -04:00
Brad Payne (Vir Linden) f8a8499c9d merge 2010-06-15 15:01:08 -04:00
Andrew Polunin e460985ddf EXT-7639 FIXED added shop button which reacts according to the ticket description
- Added method LLAccordionCtrl::getExpandedTab() which search for the first expanded accordion tab. This method is a bit of hacking, but I discussed it with Vadim Savchuk.
- LLAccordionCtrlTab::isExpanded() is made 'const'. This is necessary to call it from getExpandedTab() which is also 'const'.
- Added all provided Marketplace URLs (taken from EXT-7257) to the settings.xml. So URLs can be configured without recompilation.
- Added method LLCOFWearables::getSelectedItems() which can be used to get ALL selected items (not only one).
- Class LLShopURLDispatcher is implemented in the llpaneloutfitedit.cpp.
- Added callback LLPanelOutfitEdit::onShopButtonClicked() which calls LLShopURLDispatcher to send user to the correct URL.
- Added shop button (shop_btn) widget in panel_outfit_edit.xml. It has invalid icon for now. After review I'm going to reassign the ticket to someone who will provide correct icons.

Reviewed by Vadim Savchuk and Mike Antipov at https://codereview.productengine.com/secondlife/r/569/

--HG--
branch : product-engine
2010-06-15 21:52:15 +03:00
Brad Payne (Vir Linden) 9b014886b0 merge 2010-06-15 14:36:32 -04:00
Monroe Linden d6af2d0985 Fix for EXT-7414 (Jumping to a specific time in a video stream does not work in Viewer 2.)
This was a race condition.  In the repro case, LLViewerMediaImpl::seek() was getting called before the media source got a chance to be loaded (since the load is now delayed at least 1 frame due to the priority calculations), so the seek command was being dropped.

The fix is to save the seek time in mPreviousMediaTime in this case, and rearrange the code in LLViewerMediaImpl::loadURI() so that it gets used whenever it's non-zero.  I've also added similar code in LLViewerMediaImpl::pause() and LLViewerMediaImpl::start() to set mPreviousMediaState.  (If there are any cases where content wants parcel media to start out paused, they would have had a similar issue.)

Reviewed by Callum and Richard at http://codereview.lindenlab.com/2478002 .
2010-06-15 10:53:02 -07:00
Richard Linden a37e6ce52e merge 2010-06-15 10:25:47 -07:00
Vadim Savchuk 33c3064639 EXT-7808 FIXED Renamed the "Wear" context menu item to "Replace" in My Outfits and Add Wearable panels.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/582/

--HG--
branch : product-engine
2010-06-15 20:23:39 +03:00
Brad Payne (Vir Linden) 44f65edd68 merge 2010-06-15 12:53:56 -04:00
Lynx Linden da078d9a35 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-06-15 17:28:33 +01:00
Lynx Linden b2b6d52807 EXT-7851 FIXED Cleaned up code to avoid confusion.
The mTmpWriteBuffer member variable was never actually being allocated
because it was being shadowed by a local variable. This is why the
code never crashed. I've removed the member variable as it was clearly
never used and really confused the code.
2010-06-15 17:28:17 +01:00
Vladimir Pchelko 26c97318aa EXT-7776 FIXED Button label was renamed.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/578/

--HG--
branch : product-engine
2010-06-15 18:36:58 +03:00
Tofu Linden 85c14e4510 fix minor xml barf. 2010-06-15 15:53:04 +01:00
Tofu Linden 61a99e8ac6 merge backout 2010-06-15 15:40:56 +01:00
Tofu Linden 65d8872507 merge fix in unrelated file. 2010-06-15 15:35:47 +01:00
Aimee Linden 0b523e4027 Merge 2010-06-15 14:57:16 +01:00
Aimee Linden d5ddb91a68 EXT-7524 FIXED Save snapshot to inventory results in crash 2010-06-15 14:55:46 +01:00
Tofu Linden b9ea8cc0b5 final(?) merge to revert snapshot floater to 2.0.1 level. 2010-06-15 14:55:05 +01:00
Tofu Linden 9fd6bab430 Backed out changeset 1acc14a5e7ac 2010-06-15 14:51:03 +01:00
Tofu Linden 23b395b91d merge backout. 2010-06-15 14:50:30 +01:00
Tofu Linden e490d6974d Backed out changeset 4206f9061a67 2010-06-15 14:50:15 +01:00