From 8fa23739a1409d8e93252985d7f5951f518cdb21 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Tue, 13 Apr 2010 13:18:54 -0700 Subject: Fix for EXT-6750 (disabled attachment media still plays). LLViewerMediaImpl::shouldShowBasedOnClass() was always returning true for focused media. This was incorrect, since it made click-focusing on media override the class-based disable preferences. Reviewed by Callum at http://codereview.lindenlab.com/1178023 --- indra/newview/llviewermedia.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 0f5a984188..6ff46222ff 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2985,8 +2985,9 @@ bool LLViewerMediaImpl::shouldShowBasedOnClass() const // " outside = " << (!inside_parcel && gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_OUTSIDE_PARCEL_SETTING)) << llendl; // If it has focus, we should show it - if (hasFocus()) - return true; + // This is incorrect, and causes EXT-6750 (disabled attachment media still plays) +// if (hasFocus()) +// return true; // If it is attached to an avatar and the pref is off, we shouldn't show it if (attached_to_another_avatar) -- cgit v1.2.3 From 7e210d185f9b5bccdeb108e79b97a7a1a44b4374 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 13 Apr 2010 18:07:24 -0700 Subject: fix for EXT-6317 and EXT-2418 regressions in installed viewers new 32-bit mouse cursors were not getting packaged by installer for windows builds reviewed by Monroe --- indra/newview/res/toolbuy.cur | Bin 4286 -> 0 bytes indra/newview/res/toolopen.cur | Bin 4286 -> 0 bytes indra/newview/res/toolsit.cur | Bin 4286 -> 0 bytes indra/newview/res/viewerRes.rc | 3 --- 4 files changed, 3 deletions(-) delete mode 100644 indra/newview/res/toolbuy.cur delete mode 100644 indra/newview/res/toolopen.cur delete mode 100644 indra/newview/res/toolsit.cur (limited to 'indra/newview') diff --git a/indra/newview/res/toolbuy.cur b/indra/newview/res/toolbuy.cur deleted file mode 100644 index 7fd552a78e..0000000000 Binary files a/indra/newview/res/toolbuy.cur and /dev/null differ diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur deleted file mode 100644 index 1562f5bc95..0000000000 Binary files a/indra/newview/res/toolopen.cur and /dev/null differ diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur deleted file mode 100644 index a1f99cfe6d..0000000000 Binary files a/indra/newview/res/toolsit.cur and /dev/null differ diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 7a965cf57e..3a20d91129 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -119,9 +119,6 @@ TOOLPIPETTE CURSOR "toolpipette.cur" TOOLPLAY CURSOR "toolplay.cur" TOOLPAUSE CURSOR "toolpause.cur" TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" -TOOLOPEN CURSOR "toolopen.cur" -TOOLSIT CURSOR "toolsit.cur" -TOOLBUY CURSOR "toolbuy.cur" ///////////////////////////////////////////////////////////////////////////// // -- cgit v1.2.3 From b15629c12f9371773998075f8b599527b73c3051 Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Wed, 14 Apr 2010 15:22:51 -0400 Subject: This change originally to fix EXT-1655 has caused a failure to render sitting avatars (EXT-6835). We can probably find a "right" fix, but for now backing it out. Backed out changeset bd384ded4268 --- indra/newview/llagent.cpp | 10 +++++----- indra/newview/llvoavatar.cpp | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index d9d95f1cd6..c5d7f6f118 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -2296,11 +2296,6 @@ void LLAgent::stopAutoPilot(BOOL user_cancel) { resetAxes(mAutoPilotTargetFacing); } - // If the user cancelled, don't change the fly state - if (!user_cancel) - { - setFlying(mAutoPilotFlyOnStop); - } //NB: auto pilot can terminate for a reason other than reaching the destination if (mAutoPilotFinishedCallback) { @@ -2308,6 +2303,11 @@ void LLAgent::stopAutoPilot(BOOL user_cancel) } mLeaderID = LLUUID::null; + // If the user cancelled, don't change the fly state + if (!user_cancel) + { + setFlying(mAutoPilotFlyOnStop); + } setControlFlags(AGENT_CONTROL_STOP); if (user_cancel && !mAutoPilotBehaviorName.empty()) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 16eb877b1d..f5e83ed025 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5619,8 +5619,6 @@ void LLVOAvatar::sitDown(BOOL bSitting) //----------------------------------------------------------------------------- void LLVOAvatar::sitOnObject(LLViewerObject *sit_object) { - sitDown(TRUE); - if (isSelf()) { // Might be first sit @@ -5653,6 +5651,7 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object) mDrawable->mXform.setRotation(mDrawable->getWorldRotation() * inv_obj_rot); gPipeline.markMoved(mDrawable, TRUE); + sitDown(TRUE); mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject mRoot.setPosition(getPosition()); mRoot.updateWorldMatrixChildren(); -- cgit v1.2.3