From 48e2ec0340272efcb5caa7c5affaabfbf8d69c78 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Wed, 17 Nov 2010 20:04:30 -0500
Subject: [PATCH] SH-480 FIX meshes are not added to objects folder on upload
curl host scrubbing was causing object creation for mesh prims to fail.
Commenting out the offending lines so we can have a functional release.
Will file a separate bug for Vir to investigate when/if we can re-enable
host scrubbing on these URLs for a future release.
Approach approved by davep.
---
indra/newview/llmeshrepository.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index f00a8565f79..1313033f4e3 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1409,8 +1409,8 @@ LLMeshUploadThread::LLMeshUploadThread(LLMeshUploadThread::instance_list& data,
mUploadObjectAssetCapability = gAgent.getRegion()->getCapability("UploadObjectAsset");
mNewInventoryCapability = gAgent.getRegion()->getCapability("NewFileAgentInventoryVariablePrice");
- mUploadObjectAssetCapability = scrub_host_name(mUploadObjectAssetCapability);
- mNewInventoryCapability = scrub_host_name(mNewInventoryCapability);
+ //mUploadObjectAssetCapability = scrub_host_name(mUploadObjectAssetCapability);
+ //mNewInventoryCapability = scrub_host_name(mNewInventoryCapability);
mOrigin += gAgent.getAtAxis() * scale.magVec();
}
--
GitLab