Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Conflicts:
	indra/newview/llnetmap.cpp

indra/newview/llvoavatarself.cpp

@@ -900,9 +900,9 @@ void LLVOAvatarSelf::updateRegion(LLViewerRegion *regionp)
 //virtual
 void LLVOAvatarSelf::idleUpdateTractorBeam()
 {
-
-
-	if(gSavedSettings.getBOOL("DisablePointAtAndBeam"))
+	// <edit>
+	static LLCachedControl<bool> disable_pointat_effect("DisablePointAtAndBeam");
+	if (disable_pointat_effect)
 	{
 		return;
 	}
@@ -2495,7 +2495,7 @@ public:
 
 	/*virtual*/ void completedHeaders(U32 status, std::string const& reason, AIHTTPReceivedHeaders const& headers)
 	{
-		if (200 <= status && status < 300)
+		if (isGoodStatus(status))
 		{
 			LL_DEBUGS("Avatar") << "status OK" << llendl;
 		}