Commit Graph

3049 Commits (6f52f1e502cf030ceb4e14963fdda1021ea33023)

Author SHA1 Message Date
Eric M. Tulla (BigPapi) 6f52f1e502 Post merge compile fixes
--HG--
branch : avatar-pipeline
2009-11-13 20:18:44 -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
Leyla Farazha c5732c824f merge 2009-11-13 16:17:46 -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
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
Nyx (Neal Orman) 2aa9f1bcbe EXT-2477 minimizing while in appearance editing mode leaves a bad state
when minimizing the viewer while in appearance editing mode with unsaved changes
kicks you out of appearance editing mode and leaves you unable to recover as
the editor always starts itself on the shape tab. Fixed this in two ways:

1) if a wearable is dirty when the editor is opened, that is the tab that is
   selected.

2) the camera mode is not forcibly changed away from appearance editing mode
   on minimize. This only needs to happen if we are in mouselook.

Code reviewed by Vir.

--HG--
branch : avatar-pipeline
2009-11-13 14:57:06 -05:00
Rick Pasetto ca630bf6bb Add background to media controls
This actually required some help from James and Richard.  Thanks, guys!

This adds custom-drawing of a background image underneath the
icons that make up the media controls in the layout stack.
In order to have this work, we had to publicize API in lllayoutstack
to force relayout to calculate the size.

I also did another cleanup pass ("Boy Scout Rule") that
squirreled away all pertinent controls into membed variables,
instead of doing a getChild() every time updateShape() is called.

Readjusted a bunch of components as well.
2009-11-13 11:52:12 -08:00
Leyla Farazha ce397569bf merge 2009-11-13 11:48:51 -08:00
Leyla Farazha 20f9ea904a Backed out main_view.xml 2009-11-13 11:47:23 -08:00
Leyla Farazha 1303b7371c Backed out changeset fb21e02f8f08 2009-11-13 11:45:52 -08:00
Tofu Linden 224cfffa1c merge. 2009-11-13 19:44:01 +00:00
Loren Shih 0fb0ce836d EXT-2428 : Wearing a look should update the "Current Look" sidepanel string
Both double-clicking on an outfit to wear, and wearing an outfit from side panel, will now update the current look string.

--HG--
branch : avatar-pipeline
2009-11-13 14:42:28 -05:00
Tofu Linden 7722105e4e set the outgoing call window's dock point in postBuild() instead of onOpen() to avoid it being in the wrong place for a frame. 2009-11-13 19:38:13 +00:00
callum 7e2d240658 Merge to tip 2009-11-13 11:05:18 -08:00
callum be72748d2a Fix for DEV-42152 (Streaming media broken on QuickTime) 2009-11-13 11:03:39 -08:00
Lynx Linden 69ca84a6a4 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-13 18:34:12 +00:00
Steve Bennetts b3b608b2a8 Merge from product-engine 2009-11-13 10:17:56 -08:00
Tofu Linden 1b0b439c23 make the outgoing call dialog appear and disappear smarter.
this is sort of less like the spec but more like... reality...
2009-11-13 17:53:12 +00:00
Nat Goodspeed 8dda668fc4 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-13 12:22:40 -05:00
James Cook 230f28080c merge 2009-11-13 09:10:41 -08:00
James Cook 543fdfd512 More explicit test code for dummy widget creation.
Added "Inspectors Test" back to login debug menu.
2009-11-13 09:07:14 -08:00
Mike Antipov 8a0341f42e Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
Fixed issue: "Snapshort button can appear first due to its the least width while Bottom Bar extending"
	- implemented ordering in which buttons can be shown: Gesture, Move, View, Snapshot.

--HG--
branch : product-engine
2009-11-13 18:58:23 +02:00
Alexei Arabadji f9d3791aaf Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2009-11-13 18:50:10 +02:00
Brad Payne (Vir Linden) d065a185e0 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-13 11:45:16 -05:00
Brad Payne (Vir Linden) 036b0b7d8d removed dead code that was triggering a warning on some platforms
--HG--
branch : avatar-pipeline
2009-11-13 11:43:32 -05:00
Eric M. Tulla (BigPapi) 885bd589f5 merging changes accidentally made to default into avp branch
--HG--
branch : avatar-pipeline
2009-11-13 11:20:26 -05:00
Tofu Linden 7e59bf358d merge. 2009-11-13 16:18:53 +00:00
Andrew Dyukov 3add88cd97 Fixed normal bug EXT-1014 (Unable to move undocked camera controls bar)
--HG--
branch : product-engine
2009-11-13 18:12:55 +02:00