4 files changed, 27 insertions, 7 deletions

diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt
index e93fe90650..367486eee7 100644
--- a/indra/llmath/CMakeLists.txt
+++ b/indra/llmath/CMakeLists.txt
@@ -62,6 +62,8 @@ set(llmath_HEADER_FILES
     llv4matrix3.h
     llv4matrix4.h
     llv4vector3.h
+    llvector4a.h
+    llmatrix4a.h
     llvolume.h
     llvolumemgr.h
     llsdutil_math.h
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 88969af4bd..d7d36d901d 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -4126,14 +4126,14 @@ void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
 
 						norm_mat.rotate(n[v1], t);
 
-						t.normalize3Fast();
+						t.normalize3fast();
 						normals.push_back(LLVector3(t[0], t[1], t[2]));
 
 						mat.affineTransform(v[v2], t);
 						vertices.push_back(LLVector3(t[0], t[1], t[2]));
 						
 						norm_mat.rotate(n[v2], t);
-						t.normalize3Fast();
+						t.normalize3fast();
 						normals.push_back(LLVector3(t[0], t[1], t[2]));
 
 						segments.push_back(vertices.size());
@@ -5349,7 +5349,7 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build)
 		mCenter, cuv,
 		mesh[0+offset].mPos, tc[0],
 		mesh[1+offset].mPos, tc[1]);
-	binormal.normalize3Fast();
+	binormal.normalize3fast();
 
 	LLVector4a normal;
 	LLVector4a d0, d1;
@@ -5369,7 +5369,7 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build)
 		normal.setCross3(d1, d0);
 	}
 
-	normal.normalize3Fast();
+	normal.normalize3fast();
 
 	VertexData vd;
 	vd.mPosition = mCenter;
@@ -5675,7 +5675,7 @@ void LLVolumeFace::createBinormals()
 		//normalize binormals
 		for (U32 i = 0; i < mNumVertices; i++) 
 		{
-			binorm[i].normalize3Fast();
+			binorm[i].normalize3fast();
 		}
 	}
 }
@@ -5803,7 +5803,7 @@ void LLVolumeFace::appendFace(const LLVolumeFace& face, LLMatrix4& mat_in, LLMat
 	{
 		mat.affineTransform(src_pos[i], dst_pos[i]);
 		norm_mat.rotate(src_norm[i], dst_norm[i]);
-		dst_norm[i].normalize3Fast();
+		dst_norm[i].normalize3fast();
 
 		dst_tc[i] = src_tc[i];
 
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 669ff3ffd6..77f3984ecb 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1241,6 +1241,16 @@ void LLPanelObject::sendIsPhantom()
 	}
 }
 
+#include "llsdutil.h"
+class CostResponder : public LLHTTPClient::Responder
+{
+public:
+	CostResponder(U32 id) { mID = id; }
+	virtual void result(const LLSD& content) { llinfos << ll_pretty_print_sd(content) << llendl; }
+
+	U32 mID;
+};
+
 void LLPanelObject::sendPhysicsShapeType()
 {
 	U8 value = (U8)mComboPhysicsShapeType->getCurrentIndex();
@@ -1255,6 +1265,13 @@ void LLPanelObject::sendPhysicsShapeType()
 	{
 		llinfos << "update physics shape type not changed" << llendl;
 	}
+
+	std::string url = gAgent.getRegion()->getCapability("GetObjectCost");
+	LLSD body = LLSD::emptyArray();
+	
+	body.append(LLSelectMgr::getInstance()->getSelection()->getFirstObject()->getID());
+	
+	LLHTTPClient::post( url, body, new CostResponder(body[0].asInteger()) );
 }
 
 void LLPanelObject::sendCastShadows()
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 4fdabd7ff0..268e14674e 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1497,6 +1497,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 	capabilityNames.append("FetchLibDescendents");
 	capabilityNames.append("GetTexture");
 	capabilityNames.append("GetMesh");
+	capabilityNames.append("GetObjectCost");
 	capabilityNames.append("GroupProposalBallot");
 	capabilityNames.append("HomeLocation");
 	capabilityNames.append("LandResources");
@@ -1513,13 +1514,13 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 	capabilityNames.append("ProvisionVoiceAccountRequest");
 	capabilityNames.append("RemoteParcelRequest");
 	capabilityNames.append("RequestTextureDownload");
-	capabilityNames.append("SimulatorFeatures");
 	capabilityNames.append("SearchStatRequest");
 	capabilityNames.append("SearchStatTracking");
 	capabilityNames.append("SendPostcard");
 	capabilityNames.append("SendUserReport");
 	capabilityNames.append("SendUserReportWithScreenshot");
 	capabilityNames.append("ServerReleaseNotes");
+	capabilityNames.append("SimulatorFeatures");
 	capabilityNames.append("StartGroupProposal");
 	capabilityNames.append("TextureStats");
 	capabilityNames.append("UntrustedSimulatorMessage");