Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Steve Bennetts 0d25816280 merge 2009-11-14 10:25:14 -08:00
Steve Bennetts ed06c4b8b9 merge from product-engine 2009-11-14 10:25:02 -08:00
Steve Bennetts 637b6673bc More texture cache fixes, including a possible deadlock when the cache was getting purged.
Significantly reduced spurrious warnings and delition of non sin-based texture fetch comptabable sided cache files.
2009-11-14 10:22:32 -08:00
Sergei Litovchuk 93c1e1bd6e No ticket.
- Fixed toggleable menu in Picks panel.
- Minor optimization of LLToggleableMenu.

--HG--
branch : product-engine
2009-11-14 19:15:51 +02:00
Sergei Litovchuk 9e11d70225 Fixed major bug EXT-2316 "Insert the option "pay" in the profile":
- Added menu item according to Communications design spec in section 4.1.2.1.

--HG--
branch : product-engine
2009-11-14 18:12:18 +02:00
Steve Bennetts f67a8ad12e Mutex lock fix for texture cache.
Also a fix for texture purging when reducing the cache size.
2009-11-13 22:54:55 -08:00
Eric M. Tulla (BigPapi) a39bda1b77 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-13 22:23:14 -05:00
Eric M. Tulla (BigPapi) 68c6ff791f Fix for post-merge compile error. 2009-11-13 22:22:30 -05:00
richard 4c4f329acb merge 2009-11-13 18:28:20 -08:00
richard f4fdaa8ee9 merge 2009-11-13 18:27:59 -08:00
Monroe Linden a58dd26b20 Tweaks to media priority calculation.
Enabled CPU limit setting by default (set to 100% of 1 CPU).

Lowered default limits on plugin priorities: 2 normal+, 4 low, 8 total.

Limit on total number of instances now only applies to inworld media -- media instances in the UI (such as the help browser and search) don't count toward the limit.  UI media will still bump inworld media down from normal/low priority, though.

Several improvements to plugin manager debug code in the nearby media list.

Don't load unloaded instances that are at PRIORITY_SLIDESHOW or PRIORITY_HIDDEN (they don't get unloaded, they just won't be loaded unless they're at higher priority).

Added LLViewerMediaImpl::isPlayable(), which indicates whether an instance would be loaded if it were high enough in the priority list (taking into account autoplay and current load state).  Priority algorithm now takes this into account.

Fixed a couple of issues with approximate texture interest calculation and its use in setting priorities.

Adjusted sleep times on low and normal priorities to be more friendly.
2009-11-13 18:15:35 -08:00
callum 778005a350 Reworked IDropTarget COM interface impl - now much cleaner and doesn't crash! 2009-11-13 17:43:55 -08:00
Rick Pasetto 6752853423 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-13 17:42:51 -08:00
Rick Pasetto 6be35d363f Integrated most of the final artwork into the media controls 2009-11-13 17:42:38 -08:00
Eric M. Tulla (BigPapi) cd9c5e5d70 merging avatar-pipeline branch into viewer-2-0 2009-11-13 20:34:55 -05:00
brad kittenbrink 1ea60591a9 Refactoring of llviewerprecompiledheaders.h to hopefully increase stability
and reduce unnecessary dependencies and incredibuild wedging.  Hopefully in
the long run this will reduce build time.  Also cleaned up a lot of header
file usage to conform better to the coding standard.

reviewed by james and steve.
2009-11-13 20:33:59 -05:00
brad kittenbrink 67f11add9c Added a USE_PRECOMPILED_HEADER cmake variable (defaulted on) and disabled pch usage for test executables. Reviewed by james and steve. 2009-11-13 20:30:54 -05:00
Eric M. Tulla (BigPapi) 6f52f1e502 Post merge compile fixes
--HG--
branch : avatar-pipeline
2009-11-13 20:18:44 -05:00
richard 890da1d391 fix for layout of urls with icons 2009-11-13 16:50:17 -08:00
Eric M. Tulla (BigPapi) 99dcd4f493 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-13 19:27:48 -05:00
Eric M. Tulla (BigPapi) 3194c89177 Merging viewer2 changes into avp branch
--HG--
branch : avatar-pipeline
2009-11-13 19:26:20 -05:00
James Cook a1cb7debf8 merge 2009-11-13 16:21:43 -08:00
Leyla Farazha c5732c824f merge 2009-11-13 16:17:46 -08:00
James Cook 0daf4297d4 EXT-2484 Auto Set Touch to Buy when a user checks the For Sale option
Reviewed with Richard.
2009-11-13 16:16:12 -08:00
Leyla Farazha c8ed7710c5 Backed out changeset db8e08f8ba36
adding main_view.xml change rev 4863 back
2009-11-13 15:57:38 -08:00
Leyla Farazha 3abee9a450 Fix for nearby chat toasts occluding the bottom bar. 2009-11-13 15:56:46 -08:00
Loren Shih 59eb2815bf merge
--HG--
branch : avatar-pipeline
2009-11-13 18:28:27 -05:00
Loren Shih 42319d1ab8 Header file cleanup
Moved LLInventoryPanelObserver to be private to LLInventoryPanel

--HG--
branch : avatar-pipeline
2009-11-13 18:22:00 -05:00
Nyx (Neal Orman) 4bb5cd169b Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-13 18:20:01 -05:00
Nyx (Neal Orman) be429a3ae9 EXT-2429 body parts out of sync with COF
Visual param definitions weren't working properly when the wearable being
loaded had fewer visual parameters than the current definition of the wearable.
This occurred when you were loading wearables that had been created in older
versions of the client (or from the library).

Added missing parameters to mSavedVisualParamMap, and modified revertValues()
to ensure that the two maps are kept fully in sync on finishing loading the
wearable and when reverting the values.

Code reviewed by Vir

--HG--
branch : avatar-pipeline
2009-11-13 18:19:22 -05:00
Rick Pasetto 4ca8b32bce Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-13 15:11:10 -08:00
Rick Pasetto a4addf39e5 Small mods based on code review feedback from James 2009-11-13 15:09:59 -08:00
Monroe Linden 6cb4b27897 Fix for DEV-42161 (LLViewerMediaImpl::navigateInternal spam when editing object properties).
Made LLPanelMediaSettingsGeneral::updateMediaPreview() only do a navigate when the URL actually changes.
2009-11-13 14:48:24 -08:00
Loren Shih 0ce8ce50d8 merge
--HG--
branch : avatar-pipeline
2009-11-13 17:48:11 -05:00
Loren Shih acdce23299 Header file cleanup
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.

--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
Erica 21357c4822 fixing media texture image names - removing file extention 2009-11-13 14:28:58 -08:00
Loren Shih 3027c9fcce Header file #include cleanup for llinventorymodel and llinventorypanel.
Removed a bunch of unnecessary header inclues.

--HG--
branch : avatar-pipeline
2009-11-13 16:58:08 -05:00
Brad Payne (Vir Linden) cc72b78b5f Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-13 16:49:36 -05:00
Brad Payne (Vir Linden) 2c05c3dab3 For DEV-41820: Allow dragging links to Looks and Current Look: copy the link, wear if Current Look
--HG--
branch : avatar-pipeline
2009-11-13 16:48:53 -05:00
Monroe Linden d191143cbc Special-case a "401" status ("auth required") in LLMimeDiscoveryResponder::error() to be treated as a mime type of "text/html" instead of a failure. 2009-11-13 13:47:18 -08:00
Loren Shih 7a1e7dd69d merge
--HG--
branch : avatar-pipeline
2009-11-13 16:21:11 -05:00
Loren Shih f0cd44a6a2 EXT-2482 : Newly created folders have wrong default type
Removed AT_ROOT_CATEGORY and FT_ROOT_CATEGORY since those types are unused.  Changed FT_CATEGORY to FT_ROOT_INVENTORY to make its purpose more clear.

This change assumes that no agent inventories have category type 9 for either inventory type or folder preferred type.

--HG--
branch : avatar-pipeline
2009-11-13 16:18:53 -05:00
Monroe Linden 39c53fcf0e Clear the media texture to black instead of almost-black. 2009-11-13 13:05:56 -08:00
Monroe Linden 5890c850f8 Prevent the about:blank url from the initial navigate from leaking out of the webkit plugin. This should fix DEV-42766. 2009-11-13 13:05:16 -08:00
Rick Pasetto 2e70e4e2d7 Add functionality to nearby media floater: parcel media & autoplay
This change implements the enabling/disabling of parcel media,
as well as setting the user's autoplay preference.  I still
am quite confused by this UI, so we'll need to play with it a bit
to ensure it is what we want to present to users.

This adds a few helpers to llviewerparcelmedia to get the name and URL
of media.
2009-11-13 12:59:17 -08:00
Brad Payne (Vir Linden) 581fccecc8 For DEV-41818 - text change 'Goto Link' -> 'Find Original'
--HG--
branch : avatar-pipeline
2009-11-13 15:47:49 -05:00
James Cook e728dcd1ab merge 2009-11-13 12:38:53 -08:00
James Cook f9cacc57e2 EXT-2491 IM text does not appear in private IMs 2009-11-13 12:36:41 -08:00
Steve Bennetts b964f3bcca Merge from product-engine 2009-11-13 12:21:53 -08:00
Brad Payne (Vir Linden) 4b05dc4890 LLAppearanceManager cleanup - 2 methods renamed
--HG--
branch : avatar-pipeline
2009-11-13 15:20:54 -05:00