Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559

5 files changed, 12 insertions, 5 deletions

diff --git a/indra/llmath/llcamera.h b/indra/llmath/llcamera.h
index 27eaa614c9..c4d04f5d02 100644
--- a/indra/llmath/llcamera.h
+++ b/indra/llmath/llcamera.h
@@ -39,7 +39,7 @@ const F32 DEFAULT_NEAR_PLANE 		= 0.25f;
 const F32 DEFAULT_FAR_PLANE 		= 64.f;	// far reaches across two horizontal, not diagonal, regions
 
 const F32 MAX_ASPECT_RATIO 	= 50.0f;
-const F32 MAX_NEAR_PLANE 	= 10.f;
+const F32 MAX_NEAR_PLANE 	= 1023.9f; // Clamp the near plane just before the skybox ends
 const F32 MAX_FAR_PLANE 	= 100000.0f; //1000000.0f; // Max allowed. Not good Z precision though.
 const F32 MAX_FAR_CLIP		= 512.0f;
 
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 5396203317..a7c78b0275 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -85,6 +85,8 @@ const F32 LIGHT_MAX_CUTOFF = 180.f;
 const F32 REFLECTION_PROBE_MIN_AMBIANCE = 0.f;
 const F32 REFLECTION_PROBE_MAX_AMBIANCE = 100.f;
 const F32 REFLECTION_PROBE_DEFAULT_AMBIANCE = 0.f;
+// *NOTE: Clip distances are clamped in LLCamera::setNear. The max clip
+// distance is currently limited by the skybox
 const F32 REFLECTION_PROBE_MIN_CLIP_DISTANCE = 0.f;
 const F32 REFLECTION_PROBE_MAX_CLIP_DISTANCE = 1024.f;
 const F32 REFLECTION_PROBE_DEFAULT_CLIP_DISTANCE = 0.f;
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index be6f8d72e5..6b70b40860 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1571,7 +1571,11 @@ void LLMaterialEditor::onSaveAsMsgCallback(const LLSD& notification, const LLSD&
         }
         else
         {
-            LLNotificationsUtil::add("InvalidMaterialName");
+            LLNotificationsUtil::add("InvalidMaterialName", LLSD(), LLSD(), [this](const LLSD& notification, const LLSD& response) 
+                {
+                    LLNotificationsUtil::add("SaveMaterialAs", LLSD().with("DESC", mMaterialName), LLSD(),
+                        boost::bind(&LLMaterialEditor::onSaveAsMsgCallback, this, _1, _2));
+                });
         }
     }
 }
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index ff3cb39ca4..b6128ba9b6 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -261,11 +261,11 @@ void LLSpatialGroup::expandExtents(const LLVector4a* addingExtents, const LLXfor
 		LLVector3(mExtents[1].getF32ptr())
 	};
 
-	LLQuaternion backwardRotation = ~currentTransform.getRotation();
+	LLQuaternion backwardRotation = ~currentTransform.getWorldRotation();
 	for (LLVector3& corner : corners)
 	{
 		// Make coordinates relative to the current position
-		corner -= currentTransform.getPosition();
+		corner -= currentTransform.getWorldPosition();
 		// Rotate coordinates backward to the current rotation
 		corner.rotVec(backwardRotation);
 		// Expand root extents on the current corner
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp
index d35833fac9..8bf078477a 100644
--- a/indra/newview/lltoastalertpanel.cpp
+++ b/indra/newview/lltoastalertpanel.cpp
@@ -295,7 +295,8 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 			mLineEditor->setText(edit_text_contents);
 
 			std::string notif_name = mNotification->getName();
-			if (("SaveOutfitAs" == notif_name) || ("SaveSettingAs" == notif_name) || ("CreateLandmarkFolder" == notif_name) || ("CreateSubfolder" == notif_name))
+			if (("SaveOutfitAs" == notif_name) || ("SaveSettingAs" == notif_name) || ("CreateLandmarkFolder" == notif_name) || 
+                ("CreateSubfolder" == notif_name) || ("SaveMaterialAs" == notif_name))
 			{
 				mLineEditor->setPrevalidate(&LLTextValidate::validateASCII);
 			}