Merge branch 'main' into DRTVWR-587-maint-V

# Conflicts:
#	autobuild.xml

1 files changed, 68 insertions, 42 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 289a9caea4..74505d99cf 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -401,6 +401,7 @@ LLAgent::LLAgent() :
 	mHttpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID),
 	mTeleportState(TELEPORT_NONE),
 	mRegionp(NULL),
+    mInterestListMode(LLViewerRegion::IL_MODE_DEFAULT),
 
 	mAgentOriginGlobal(),
 	mPositionGlobal(),
@@ -898,11 +899,19 @@ boost::signals2::connection LLAgent::addParcelChangedCallback(parcel_changed_cal
 
 // static
 void LLAgent::capabilityReceivedCallback(const LLUUID &region_id, LLViewerRegion *regionp)
-{
-    if (regionp && regionp->getRegionID() == region_id)
+{	// Changed regions and now have the region capabilities
+    if (regionp)
     {
-        regionp->requestSimulatorFeatures();
-        LLAppViewer::instance()->updateNameLookupUrl(regionp);
+        if (regionp->getRegionID() == region_id)
+        {
+            regionp->requestSimulatorFeatures();
+            LLAppViewer::instance()->updateNameLookupUrl(regionp);
+        }
+
+        if (gAgent.getInterestListMode() == LLViewerRegion::IL_MODE_360)
+        {
+            gAgent.changeInterestListMode(LLViewerRegion::IL_MODE_360);
+        }
     }
 }
 
@@ -1366,26 +1375,21 @@ LLVector3 LLAgent::getReferenceUpVector()
 void LLAgent::pitch(F32 angle)
 {
 	// don't let user pitch if pointed almost all the way down or up
-	mFrameAgent.pitch(clampPitchToLimits(angle));
-}
-
 
-// Radians, positive is forward into ground
-//-----------------------------------------------------------------------------
-// clampPitchToLimits()
-//-----------------------------------------------------------------------------
-F32 LLAgent::clampPitchToLimits(F32 angle)
-{
 	// A dot B = mag(A) * mag(B) * cos(angle between A and B)
 	// so... cos(angle between A and B) = A dot B / mag(A) / mag(B)
 	//                                  = A dot B for unit vectors
 
 	LLVector3 skyward = getReferenceUpVector();
 
-	const F32 look_down_limit = 179.f * DEG_TO_RAD;;
-	const F32 look_up_limit   =   1.f * DEG_TO_RAD;
+	// SL-19286 Avatar is upside down when viewed from below
+	// after left-clicking the mouse on the avatar and dragging down
+	//
+	// The issue is observed on angle below 10 degrees
+	const F32 look_down_limit = 179.f * DEG_TO_RAD;
+	const F32 look_up_limit   =  10.f * DEG_TO_RAD;
 
-	F32 angle_from_skyward = acos( mFrameAgent.getAtAxis() * skyward );
+	F32 angle_from_skyward = acos(mFrameAgent.getAtAxis() * skyward);
 
 	// clamp pitch to limits
 	if ((angle >= 0.f) && (angle_from_skyward + angle > look_down_limit))
@@ -1396,8 +1400,11 @@ F32 LLAgent::clampPitchToLimits(F32 angle)
 	{
 		angle = look_up_limit - angle_from_skyward;
 	}
-   
-    return angle;
+
+	if (fabs(angle) > 1e-4)
+	{
+		mFrameAgent.pitch(angle);
+	}
 }
 
 
@@ -2908,39 +2915,60 @@ void LLAgent::processMaturityPreferenceFromServer(const LLSD &result, U8 perferr
     handlePreferredMaturityResult(maturity);
 }
 
-
-bool LLAgent::requestPostCapability(const std::string &capName, LLSD &postData, httpCallback_t cbSuccess, httpCallback_t cbFailure)
-{
-    if (!getRegion())
+// Using a new capability, tell the simulator that we want it to send everything
+// it knows about and not just what is in front of the camera, in its view
+// frustum. We need this feature so that the contents of the region that appears
+// in the 6 snapshots which we cannot see and is normally not "considered", is
+// also rendered. Typically, this is turned on when the 360 capture floater is
+// opened and turned off when it is closed.
+// Note: for this version, we do not have a way to determine when "everything"
+// has arrived and has been rendered so for now, the proposal is that users
+// will need to experiment with the low resolution version and wait for some
+// (hopefully) small period of time while the full contents resolves.
+// Pass in a flag to ask the simulator/interest list to "send everything" or
+// not (the default mode)
+void LLAgent::changeInterestListMode(const std::string &new_mode)
+{
+    if (new_mode != mInterestListMode)
     {
-        return false;
+        mInterestListMode = new_mode;
+
+        // Change interest list mode for all regions.  If they are already set for the current mode,
+        // the setting will have no effect.
+        for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
+             iter != LLWorld::getInstance()->getRegionList().end();
+             ++iter)
+        {
+            LLViewerRegion *regionp = *iter;
+            if (regionp && regionp->isAlive() && regionp->capabilitiesReceived())
+            {
+                regionp->setInterestListMode(mInterestListMode);
+            }
+        }
     }
-    std::string url = getRegion()->getCapability(capName);
+	else
+	{
+		LL_DEBUGS("360Capture") << "Agent interest list mode is already set to " << mInterestListMode << LL_ENDL;
+	}
+}
 
-    if (url.empty())
+
+bool LLAgent::requestPostCapability(const std::string &capName, LLSD &postData, httpCallback_t cbSuccess, httpCallback_t cbFailure)
+{
+    if (getRegion())
     {
-        LL_WARNS("Agent") << "Could not retrieve region capability \"" << capName << "\"" << LL_ENDL;
-        return false;
+        return getRegion()->requestPostCapability(capName, postData, cbSuccess, cbFailure);
     }
-
-    LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpPost(url, mHttpPolicy, postData, cbSuccess, cbFailure);
-    return true;
+	return false;
 }
 
 bool LLAgent::requestGetCapability(const std::string &capName, httpCallback_t cbSuccess, httpCallback_t cbFailure)
 {
-    std::string url;
-
-    url = getRegionCapability(capName);
-
-    if (url.empty())
+    if (getRegion())
     {
-        LL_WARNS("Agent") << "Could not retrieve region capability \"" << capName << "\"" << LL_ENDL;
-        return false;
+        return getRegion()->requestGetCapability(capName, cbSuccess, cbFailure);
     }
-
-    LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpGet(url, mHttpPolicy, cbSuccess, cbFailure);
-    return true;
+    return false;
 }
 
 BOOL LLAgent::getAdminOverride() const	
@@ -3706,7 +3734,6 @@ void LLAgent::processScriptControlChange(LLMessageSystem *msg, void **)
 			// take controls
 			msg->getU32("Data", "Controls", controls, block_index );
 			msg->getBOOL("Data", "PassToAgent", passon, block_index );
-			U32 total_count = 0;
 			for (i = 0; i < TOTAL_CONTROLS; i++)
 			{
 				if (controls & ( 1 << i))
@@ -3719,7 +3746,6 @@ void LLAgent::processScriptControlChange(LLMessageSystem *msg, void **)
 					{
 						gAgent.mControlsTakenCount[i]++;
 					}
-					total_count++;
 				}
 			}
 		}