diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-17 20:04:37 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-17 20:04:37 -0500 |
| commit | 57e5841a9c642e8f1044daf33f44ede173ef48b9 (patch) | |
| tree | 7a8a7dc18e37a01a97c22e42ea6c35614b717e9e /indra | |
| parent | 071e0339b75f4377b65ffb1ed4c574f5d2223a37 (diff) | |
| parent | 48e2ec0340272efcb5caa7c5affaabfbf8d69c78 (diff) | |
Automated merge with https://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 1f5d577a20..2f432ba0be 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1415,8 +1415,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(); } |