From bc8fe00b991522ea310efd2eac3af24a11a05964 Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Thu, 3 Sep 2015 19:21:49 +0300 Subject: MAINT-5268 (Rotating an object that's used as grid reference goes crazy) --- indra/newview/llmaniprotate.cpp | 4 ++-- indra/newview/llselectmgr.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp index f172aa0955..aa520a728c 100755 --- a/indra/newview/llmaniprotate.cpp +++ b/indra/newview/llmaniprotate.cpp @@ -591,7 +591,7 @@ void LLManipRotate::drag( S32 x, S32 y ) continue; } } - + LLQuaternion new_rot = selectNode->mSavedRotation * mRotation; std::vector& child_positions = object->mUnselectedChildrenPositions ; std::vector child_rotations; @@ -1294,7 +1294,7 @@ LLVector3 LLManipRotate::getConstraintAxis() else { S32 axis_dir = mManipPart - LL_ROT_X; - if ((axis_dir >= 0) && (axis_dir < 3)) + if ((axis_dir >= LL_NO_PART) && (axis_dir < LL_Z_ARROW)) { axis.mV[axis_dir] = 1.f; } diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 55bcb3dc65..49a7ab3280 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1235,7 +1235,13 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 & } else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull()) { - mGridRotation = first_grid_object->getRenderRotation(); + LLSelectNode *node = mSelectedObjects->findNode(first_grid_object); + if (node) { + mGridRotation = node->mSavedRotation; + } + else { + mGridRotation = first_grid_object->getRenderRotation(); + } LLVector4a min_extents(F32_MAX); LLVector4a max_extents(-F32_MAX); -- cgit v1.2.3 From 9bfd0f75c3e18a4743e4b5f7e0d5d15d99aca656 Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Tue, 8 Sep 2015 20:08:07 +0300 Subject: MAINT-5268 (Rotating an object that's used as grid reference goes crazy) - changeset 2 --- indra/newview/llmaniprotate.cpp | 2 +- indra/newview/llselectmgr.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp index aa520a728c..e917b0ae52 100755 --- a/indra/newview/llmaniprotate.cpp +++ b/indra/newview/llmaniprotate.cpp @@ -591,7 +591,7 @@ void LLManipRotate::drag( S32 x, S32 y ) continue; } } - + LLQuaternion new_rot = selectNode->mSavedRotation * mRotation; std::vector& child_positions = object->mUnselectedChildrenPositions ; std::vector child_rotations; diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 49a7ab3280..577c336ac7 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1236,10 +1236,12 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 & else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull()) { LLSelectNode *node = mSelectedObjects->findNode(first_grid_object); - if (node) { + if (node) + { mGridRotation = node->mSavedRotation; } - else { + else + { mGridRotation = first_grid_object->getRenderRotation(); } -- cgit v1.2.3 From 7048679ac8c6cea9238c1602d75ead4d983cdbc0 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 10 Sep 2015 16:16:50 +0300 Subject: MAINT-5584 FIXED On voice disabled parcel or region, speak button remains disabled in ad-hoc and group voice calls - you can hear but not speak. --- indra/newview/llagent.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 297bd9a05b..3f32be1d68 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -275,9 +275,24 @@ bool LLAgent::isActionAllowed(const LLSD& sdname) if (param == "speak") { - if ( gAgent.isVoiceConnected() && - LLViewerParcelMgr::getInstance()->allowAgentVoice() && - ! LLVoiceClient::getInstance()->inTuningMode() ) + bool allow_agent_voice = false; + LLVoiceChannel* channel = LLVoiceChannel::getCurrentVoiceChannel(); + if (channel != NULL) + { + if (channel->getSessionName().empty() && channel->getSessionID().isNull()) + { + // default channel + allow_agent_voice = LLViewerParcelMgr::getInstance()->allowAgentVoice(); + } + else + { + allow_agent_voice = channel->isActive() && channel->callStarted(); + } + } + + if (gAgent.isVoiceConnected() && + allow_agent_voice && + !LLVoiceClient::getInstance()->inTuningMode()) { retval = true; } -- cgit v1.2.3